From 9866bf63c644cab9d0eaf7f40bc82c0f6793dc25 Mon Sep 17 00:00:00 2001
From: Rob Carnell <bertcarnell@gmail.com>
Date: Sun, 28 Jan 2024 08:29:33 -0500
Subject: [PATCH] Dropped Solaris on R-hub, changed checkout to v4

---
 .github/workflows/r-cmd-check.yml | 12 ++++++------
 .github/workflows/rhub-check.yml  | 12 +-----------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/r-cmd-check.yml b/.github/workflows/r-cmd-check.yml
index 9048065..68162f3 100644
--- a/.github/workflows/r-cmd-check.yml
+++ b/.github/workflows/r-cmd-check.yml
@@ -23,10 +23,10 @@ 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
@@ -34,7 +34,7 @@ jobs:
 
     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
index 003c4a1..a9a54eb 100644
--- 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}