Dropped Solaris on R-hub, changed checkout to v4

bertcarnell · Jan 28, 2024 · 9866bf6 · 9866bf6
1 parent 22f9014
commit 9866bf6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/.github/workflows/r-cmd-check.yml b/.github/workflows/r-cmd-check.yml
@@ -23,18 +23,18 @@ jobs:
           - {os: windows-latest, r: 'devel'}
           - {os: macOS-latest, r: 'release'}
           - {os: macOS-latest, r: 'devel'}
-          #- {os: ubuntu-latest, r: 'release'}
-          #- {os: ubuntu-latest, r: 'devel'}
-          - {os: ubuntu-20.04, r: 'release'}
-          - {os: ubuntu-20.04, r: 'devel'}
+          - {os: ubuntu-latest, r: 'release'}
+          - {os: ubuntu-latest, r: 'devel'}
+          #- {os: ubuntu-20.04, r: 'release'}
+          #- {os: ubuntu-20.04, r: 'devel'}
 
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       GITHUB_PAT: ${{ secrets.MY_PAT }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: R setup-pandoc@master
         uses: r-lib/actions/setup-r@v2
@@ -106,7 +106,7 @@ jobs:
 
       - name: Upload check results
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ runner.os }}-r${{ matrix.config.r }}-results
           path: check
diff --git a/.github/workflows/rhub-check.yml b/.github/workflows/rhub-check.yml
@@ -14,12 +14,11 @@ jobs:
         config:
           - {cmd: check_with_valgrind}
           - {cmd: check_with_sanitizers}
-          - {cmd: check_on_solaris}
           - {cmd: check_for_cran}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: R
         uses: r-lib/actions/setup-r@v2
@@ -33,17 +32,8 @@ jobs:
         shell: Rscript {0}
 
       - name: Build Package and Run through Rhub
-        if: ( ${{ matrix.config.cmd }} == "check_on_solaris" ) == false
         run: |
           file_name <- pkgbuild::build("../triangle")
           rhub::validate_email(email = "${{ secrets.RHUB_EMAIL }}", token = "${{ secrets.RHUB_EMAIL_TOKEN }}")
           rhub::${{ matrix.config.cmd }}(path=file_name)
         shell: Rscript {0}
-
-      - name: Build Package and Run through Rhub
-        if: ${{ matrix.config.cmd }} == "check_on_solaris"
-        run: |
-          file_name <- pkgbuild::build("../triangle")
-          rhub::validate_email(email = "${{ secrets.RHUB_EMAIL }}", token = "${{ secrets.RHUB_EMAIL_TOKEN }}")
-          rhub::${{ matrix.config.cmd }}(path=file_name, env_vars = c("_R_CHECK_FORCE_SUGGESTS_" = "false"))
-        shell: Rscript {0}