Update r-daily.yml

rstats-on-nix · Apr 5, 2024 · cbe38ce · cbe38ce
1 parent 3ca2372
commit cbe38ce
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/.github/workflows/r-daily.yml b/.github/workflows/r-daily.yml
@@ -45,13 +45,8 @@ jobs:
           git fetch origin
           git merge origin/r-daily
           git fetch upstream
-          # in case of conflict, uncomment the next line and comment the last
-          git checkout upstream/master -- pkgs/development/r-modules/default.nix
-          git checkout upstream/master -- pkgs/development/r-modules/cran-packages.nix
-          git checkout upstream/master -- pkgs/development/r-modules/bioc-packages.nix
-          git checkout upstream/master -- pkgs/development/r-modules/bioc-annotation-packages.nix
-          git checkout upstream/master -- pkgs/development/r-modules/bioc-experiment-packages.nix
-          #git merge upstream/master
+          # in case of conflict, just get the files in r-modules from master and upload them
+          git merge upstream/master
 
       - name: Update R packages
         run: |