Another setup-r rtools version fix

gaborcsardi · gaborcsardi · commit 33d9fe4e020f · 2023-01-09T15:50:45.000+01:00
[ci skip]
diff --git a/.github/workflows/rtools.yaml b/.github/workflows/rtools.yaml
@@ -16,7 +16,7 @@ jobs:
           # the default is rtools40 here
           - { r: 'release'                       }
           # manually select rtools42
-          - { r: 'release', rtools-version: "42" }
+          - { r: 'release', rtools-version: '42' }
           # defaults to rtools43
           - { r: 'devel'                         }
 
@@ -33,7 +33,6 @@ jobs:
         with:
           r-version: ${{ matrix.config.r }}
           rtools-version: ${{ matrix.config.rtools-version }}
-          http-user-agent: ${{ matrix.config.http-user-agent }}
           use-public-rspm: true
 
       - name: "Check what version of rtools is installed"
diff --git a/setup-r/lib/installer.js b/setup-r/lib/installer.js
@@ -401,9 +401,9 @@ function acquireRWindows(version) {
 function acquireRtools(version, rversion) {
     return __awaiter(this, void 0, void 0, function* () {
         const versionNumber = parseInt(version.substring(0, 2));
-        const rtools43 = versionNumber >= 42;
+        const rtools43 = versionNumber >= 43;
         const rtools42 = !rtools43 && versionNumber >= 41;
-        const rtools40 = !rtools42 && versionNumber >= 40;
+        const rtools40 = !rtools43 && !rtools42 && versionNumber >= 40;
         const rtools3x = !rtools43 && !rtools42 && !rtools40;
         var downloadUrl, fileName;
         if (rtools3x) {
diff --git a/setup-r/src/installer.ts b/setup-r/src/installer.ts
@@ -379,9 +379,9 @@ async function acquireRWindows(version: string): Promise<string> {
 
 async function acquireRtools(version: string, rversion: string) {
   const versionNumber = parseInt(version.substring(0, 2));
-  const rtools43 = versionNumber >= 42;
+  const rtools43 = versionNumber >= 43;
   const rtools42 = !rtools43 && versionNumber >= 41;
-  const rtools40 = !rtools42 && versionNumber >= 40;
+  const rtools40 = !rtools43 && !rtools42 && versionNumber >= 40;
   const rtools3x = !rtools43 && !rtools42 && !rtools40;
   var downloadUrl, fileName;
   if (rtools3x) {
