GA: modernize

HenrikBengtsson · Jul 29, 2024 · c31da2c · c31da2c
1 parent 3f308c3
commit c31da2c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 23 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -6,7 +6,7 @@ jobs:
   R-CMD-check:
     if: "! contains(github.event.head_commit.message, '[ci skip]')"    
 
-    timeout-minutes: 10
+    timeout-minutes: 45
 
     runs-on: ${{ matrix.config.os }}
 
@@ -20,16 +20,16 @@ jobs:
           - {os: windows-latest, r: 'release'  }
 #          - {os: macOS-latest,   r: 'devel'    }
           - {os: macOS-latest,   r: 'release'  }
-          - {os: ubuntu-latest,  r: 'devel'    }
-          - {os: ubuntu-latest,  r: 'release'  }
-          - {os: ubuntu-latest,  r: 'oldrel'   }
-          - {os: ubuntu-latest,  r: 'oldrel-1' }
-          - {os: ubuntu-latest,  r: 'oldrel-2' }
-          - {os: ubuntu-latest,  r: '3.6'      }
-          - {os: ubuntu-latest,  r: 'release'  , language: ko,    label: ko    }
-          - {os: ubuntu-latest,  r: 'release'  , language: zh_CN, label: zh_CN }
-          - {os: ubuntu-latest,  r: 'release'  , language: zh_TW, label: zh_TW }
-
+          - {os: ubuntu-22.04,   r: 'devel'    }
+          - {os: ubuntu-22.04,   r: 'release'  }
+          - {os: ubuntu-22.04,   r: 'oldrel'   }
+          - {os: ubuntu-22.04,   r: 'oldrel-1' }
+          - {os: ubuntu-22.04,   r: 'oldrel-2' }
+          - {os: ubuntu-22.04,   r: '3.6'      }
+          - {os: ubuntu-22.04,   r: 'release'  , language: ko,    label: ko    }
+          - {os: ubuntu-22.04,   r: 'release'  , language: zh_CN, label: zh_CN }
+          - {os: ubuntu-22.04,   r: 'release'  , language: zh_TW, label: zh_TW }
+ 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       RSPM: https://packagemanager.rstudio.com/cran/__linux__/jammy/latest
@@ -40,9 +40,11 @@ jobs:
       _R_CHECK_LENGTH_1_LOGIC2_: true
       _R_CHECK_MATRIX_DATA_: true
       _R_CHECK_SUGGESTS_ONLY_: true
+      _R_CHECK_THINGS_IN_TEMP_DIR_: true
+      RCMDCHECK_ERROR_ON: note
       ## Test in other locale (optional)
       LANGUAGE: ${{ matrix.config.language }}
-
+ 
     steps:
       - uses: actions/checkout@v4
 
@@ -93,20 +95,12 @@ jobs:
         run: |
           options(width = 100)
           capabilities()
-          utils::str(list(
-            "startup::sysinfo()" = startup::sysinfo()
-          ))
-          utils::str(list(
-            R.version = R.version,
-            .Platform = .Platform,
-            Sys.info  = as.list(Sys.info())
-          ))
           pkgs <- installed.packages()[, "Package"]
           sessioninfo::session_info(pkgs, include_base = TRUE)
         shell: Rscript {0}
 
       - name: Check
-        run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran", if (.Platform$OS.type == "windows" && getRversion() >= "4.2.0") "--no-multiarch"), error_on = "warning", check_dir = "check")
+        run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran", if (.Platform$OS.type == "windows" && getRversion() >= "4.2.0") "--no-multiarch"), check_dir = "check")
         shell: Rscript {0}
 
       - name: Upload check results

diff --git a/.github/workflows/covr.yaml b/.github/workflows/covr.yaml
@@ -6,9 +6,9 @@ jobs:
   covr:
     if: "! contains(github.event.head_commit.message, '[ci skip]')"
 
-    timeout-minutes: 10
+    timeout-minutes: 30
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     name: covr