From 1b15673610ce8805f0ab150c40a7d01980bb70b0 Mon Sep 17 00:00:00 2001
From: Lukas Wallrich <lukas.wallrich@gmail.com>
Date: Mon, 27 May 2024 14:26:17 +0100
Subject: [PATCH] Fix deploy issues with packages

---
 .github/workflows/ci.yaml | 8 ++++----
 DESCRIPTION               | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 694b8ff..17a4ebd 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -58,7 +58,9 @@ jobs:
       - name: Deploy
         run: |
           R -e "
-            install.packages('rsconnect');   
+            install.packages(c('rsconnect', 'remotes'));
+            bspm::disable();
+            remotes::install_github("ESHackathon/CiteSource", force = TRUE);
             rsconnect::setAccountInfo(name=${{secrets.SHINY_LUKAS_ACCOUNT}}, token=${{secrets.SHINY_LUKAS_TOKEN}}, secret=${{secrets.SHINY_LUKAS_SECRET}}); 
             rsconnect::deployApp(appName = 'CiteSource_latest', appDir = './inst/shiny-app/CiteSource', forceUpdate = TRUE)"   
 
@@ -66,14 +68,12 @@ jobs:
         if: github.event_name == 'release' && github.event.release.tag_name != '*test*'
         run: |
           R -e "
-            install.packages('rsconnect');   
-            rsconnect::setAccountInfo(name=${{secrets.SHINY_LUKAS_ACCOUNT}}, token=${{secrets.SHINY_LUKAS_TOKEN}}, secret=${{secrets.SHINY_LUKAS_SECRET}}); 
             rsconnect::deployApp(appName = 'CiteSource', appDir = './inst/shiny-app/CiteSource', forceUpdate = TRUE)"   
 
       - name: Create pkgdown
         run: |
           R -e "
-            install.packages('pkgdown'));   
+            install.packages('pkgdown');   
             pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)"
       
       - name: Deploy to GitHub pages 🚀
diff --git a/DESCRIPTION b/DESCRIPTION
index 0be758a..c1cd8c0 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -55,6 +55,7 @@ Suggests:
     rmarkdown,
     shiny,
     shinyalert,
+    shinyjs,
     progressr,
     shinybusy,
     shinyWidgets,