corrected

ropensci · Jan 7, 2025 · 22a665b · 22a665b
1 parent 1fbe764
commit 22a665b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/test-rix-git_pkgs.yaml b/.github/workflows/test-rix-git_pkgs.yaml
@@ -33,9 +33,9 @@ jobs:
           # If you chose API tokens for write access OR if you have a private cache
           authToken: '${{ secrets.CACHIX_AUTH }}'
 
-      - name: Build default.nix with 2 local packages
+      - name: Build default.nix with 2 git packages
         run: |
-          nix-shell default.nix --run "Rscript -e \"library(rix);rix('4.4.2', git_pkgs = list(list(package_name = 'lookup', repo_url = 'https://github.com/jimhester/highlite/', commit = '767b122ef47a60a01e1707e4093cf3635a99c86b'), project_path = '.', overwrite = TRUE)\""
+          nix-shell default.nix --run "Rscript -e \"devtools::load_all();rix('4.4.2', git_pkgs = list(list(package_name = 'lookup', repo_url = 'https://github.com/jimhester/highlite/', commit = '767b122ef47a60a01e1707e4093cf3635a99c86b'), list(package_name = 'housing', repo_url = 'https://github.com/rap4all/housing/', commit = '1c860959310b80e67c41f7bbdc3e84cef00df18e'), project_path = '.', overwrite = TRUE)\""
 
       - name: Check generated default.nix
         run: cat default.nix

diff --git a/.github/workflows/test-rix-rpkgs.yaml b/.github/workflows/test-rix-rpkgs.yaml
@@ -33,9 +33,9 @@ jobs:
           # If you chose API tokens for write access OR if you have a private cache
           authToken: '${{ secrets.CACHIX_AUTH }}'
 
-      - name: Build default.nix with 2 local packages
+      - name: Build default.nix with 2 packages
         run: |
-          nix-shell default.nix --run "Rscript -e \"library(rix);rix('4.3.1', r_pkgs = c('dplyr', 'S4Vectors'), project_path = '.', overwrite = TRUE)\""
+          nix-shell default.nix --run "Rscript -e \"devtools::load_all();rix('4.3.1', r_pkgs = c('dplyr', 'S4Vectors'), project_path = '.', overwrite = TRUE)\""
 
       - name: Check generated default.nix
         run: cat default.nix

diff --git a/.github/workflows/test-rix-rstudio.yaml b/.github/workflows/test-rix-rstudio.yaml
@@ -33,9 +33,9 @@ jobs:
           # If you chose API tokens for write access OR if you have a private cache
           authToken: '${{ secrets.CACHIX_AUTH }}'
 
-      - name: Build default.nix with 2 local packages
+      - name: Build default.nix with 2 packages wrapped by Rstudio
         run: |
-          nix-shell default.nix --run "Rscript -e \"library(rix);rix('4.3.1', r_pkgs = c('dplyr', 'S4Vectors'), ide = 'rstudio', project_path = '.', overwrite = TRUE)\""
+          nix-shell default.nix --run "Rscript -e \"devtools::load_all();rix('4.3.1', r_pkgs = c('dplyr', 'S4Vectors'), ide = 'rstudio', project_path = '.', overwrite = TRUE)\""
 
       - name: Check generated default.nix
         run: cat default.nix

diff --git a/.github/workflows/test-rix-sys-tex.yaml b/.github/workflows/test-rix-sys-tex.yaml
@@ -33,9 +33,9 @@ jobs:
           # If you chose API tokens for write access OR if you have a private cache
           authToken: '${{ secrets.CACHIX_AUTH }}'
 
-      - name: Build default.nix with 2 local packages
+      - name: Build default.nix with system and tex packages
         run: |
-          nix-shell default.nix --run "Rscript -e \"library(rix);rix('4.4.2', r_pkgs = c('dplyr', 'S4Vectors'), system_pkgs = c('quarto', 'git'), tex_pkgs = c('amsmath', 'orcidlink'), project_path = '.', overwrite = TRUE)\""
+          nix-shell default.nix --run "Rscript -e \"devtools::load_all();rix('4.4.2', r_pkgs = c('dplyr', 'S4Vectors'), system_pkgs = c('quarto', 'git'), tex_pkgs = c('amsmath', 'orcidlink'), project_path = '.', overwrite = TRUE)\""
 
       - name: Check generated default.nix
         run: cat default.nix