Skip to content

Commit d296a02

Browse files
committed
Test both rtools
1 parent 3c77123 commit d296a02

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

.github/workflows/main.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
os: [windows-11-arm, ubuntu-24.04-arm]
29+
os: [windows-11-arm, windows-latest, ubuntu-24.04-arm]
3030
config: [
3131
{ label: misc, tests: 'test/unit/*_test.cpp test/unit/math/*_test.cpp test/unit/math/memory' },
3232
{ label: prim, tests: 'test/unit/math/prim' },
@@ -44,9 +44,11 @@ jobs:
4444
- name: Download and install Rtools45
4545
if: runner.os == 'Windows'
4646
run: |
47-
Invoke-WebRequest -Uri https://github.com/r-hub/rtools45/releases/download/latest/rtools45-aarch64.exe -OutFile rtools45-aarch64.exe
48-
Start-Process -FilePath rtools45-aarch64.exe -ArgumentList "/install /norestart /verysilent /SUPPRESSMSGBOXES" -NoNewWindow -Wait
49-
echo "C:/rtools45-aarch64/usr/bin;C:/rtools45-aarch64/aarch64-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
47+
$ARCH = if (${{ matrix.os }} == 'windows-11-arm') { 'aarch64' } else { 'x86_64' }
48+
$RTOOLS = if (${{ matrix.os }} == 'windows-11-arm') { 'rtools45-$ARCH' } else { 'rtools45' }
49+
Invoke-WebRequest -Uri https://github.com/r-hub/rtools45/releases/download/latest/$RTOOLS.exe -OutFile $RTOOLS.exe
50+
Start-Process -FilePath $RTOOLS.exe -ArgumentList "/install /norestart /verysilent /SUPPRESSMSGBOXES" -NoNewWindow -Wait
51+
echo "C:/$RTOOLS/usr/bin;C:/$RTOOLS/$ARCH-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
5052
5153
- name: Build Math libs
5254
shell: pwsh
@@ -78,7 +80,7 @@ jobs:
7880
strategy:
7981
fail-fast: false
8082
matrix:
81-
os: [windows-11-arm, ubuntu-24.04-arm]
83+
os: [windows-11-arm, windows-latest, ubuntu-24.04-arm]
8284
group: [1, 2, 3, 4, 5]
8385

8486
steps:
@@ -90,9 +92,11 @@ jobs:
9092
- name: Download and install Rtools45
9193
if: runner.os == 'Windows'
9294
run: |
93-
Invoke-WebRequest -Uri https://github.com/r-hub/rtools45/releases/download/latest/rtools45-aarch64.exe -OutFile rtools45-aarch64.exe
94-
Start-Process -FilePath rtools45-aarch64.exe -ArgumentList "/install /norestart /verysilent /SUPPRESSMSGBOXES" -NoNewWindow -Wait
95-
echo "C:/rtools45-aarch64/usr/bin;C:/rtools45-aarch64/aarch64-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
95+
$ARCH = if (${{ matrix.os }} == 'windows-11-arm') { 'aarch64' } else { 'x86_64' }
96+
$RTOOLS = if (${{ matrix.os }} == 'windows-11-arm') { 'rtools45-$ARCH' } else { 'rtools45' }
97+
Invoke-WebRequest -Uri https://github.com/r-hub/rtools45/releases/download/latest/$RTOOLS.exe -OutFile $RTOOLS.exe
98+
Start-Process -FilePath $RTOOLS.exe -ArgumentList "/install /norestart /verysilent /SUPPRESSMSGBOXES" -NoNewWindow -Wait
99+
echo "C:/$RTOOLS/usr/bin;C:/$RTOOLS/$ARCH-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
96100
97101
- name: Build Math libs
98102
shell: pwsh

0 commit comments

Comments
 (0)