Skip to content

Commit f21d373

Browse files
committed
more CI fixes
1 parent b475e9e commit f21d373

3 files changed

Lines changed: 19 additions & 54 deletions

File tree

.github/workflows/R-CMD-check.yaml

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
config:
26-
- {os: macOS-latest, r: 'devel'}
27-
- {os: macOS-latest, r: 'release'}
28-
- {os: windows-latest, r: 'devel'}
29-
- {os: windows-latest, r: 'release'}
30-
- {os: windows-latest, r: 'oldrel'}
31-
- {os: ubuntu-20.04, r: 'devel'}
32-
- {os: ubuntu-20.04, r: 'release'}
33-
- {os: ubuntu-20.04, r: 'oldrel'}
26+
- {os: macOS-latest, r: 'devel', rtools: ''}
27+
- {os: macOS-latest, r: 'release', rtools: ''}
28+
- {os: windows-latest, r: 'devel', rtools: '42'}
29+
- {os: windows-latest, r: 'release', rtools: '42'}
30+
- {os: windows-latest, r: 'oldrel', rtools: '40'}
31+
- {os: ubuntu-20.04, r: 'devel', rtools: ''}
32+
- {os: ubuntu-20.04, r: 'release', rtools: ''}
33+
- {os: ubuntu-20.04, r: 'oldrel', rtools: ''}
3434
env:
3535
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
3636
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
@@ -56,17 +56,10 @@ jobs:
5656
sudo apt-get install -y libcurl4-openssl-dev || true
5757
sudo apt-get install -y openmpi-bin openmpi-common libopenmpi-dev || true
5858
59-
- uses: r-lib/actions/setup-r@v2
59+
- uses: r-lib/actions/setup-r@v2.2.3
6060
with:
6161
r-version: ${{ matrix.config.r }}
62-
- name: Install Rtools42
63-
if: runner.os == 'Windows'
64-
run: |
65-
$source = 'https://cran.r-project.org/bin/windows/Rtools/rtools42/files/rtools42-5253-5107.exe'
66-
$destination = '../rtools42.exe'
67-
Invoke-WebRequest -Uri $source -OutFile $destination
68-
Start-Process -FilePath ../rtools42.exe -ArgumentList /VERYSILENT -NoNewWindow -Wait
69-
shell: powershell
62+
rtools-version: ${{ matrix.config.rtools }}
7063
- uses: r-lib/actions/setup-pandoc@v1
7164

7265
- name: Query dependencies
@@ -94,7 +87,6 @@ jobs:
9487

9588
- name: Install cmdstan
9689
run: |
97-
print(list.files("C:/rtools42"))
9890
cmdstanr::check_cmdstan_toolchain(fix = TRUE)
9991
cmdstanr::install_cmdstan(cores = 2)
10092
shell: Rscript {0}

.github/workflows/Test-coverage.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,10 @@ jobs:
8585
steps:
8686
- uses: actions/checkout@v3
8787

88-
- uses: r-lib/actions/setup-r@v2
88+
- uses: r-lib/actions/setup-r@v2.2.3
8989
with:
9090
r-version: 'release'
91-
- name: Install Rtools42
92-
if: runner.os == 'Windows'
93-
run: |
94-
$source = 'https://cran.r-project.org/bin/windows/Rtools/rtools42/files/rtools42-5253-5107.exe'
95-
$destination = '../rtools42.exe'
96-
Invoke-WebRequest -Uri $source -OutFile $destination
97-
Start-Process -FilePath ../rtools42.exe -ArgumentList /VERYSILENT -NoNewWindow -Wait
98-
shell: powershell
91+
rtools-version: '42'
9992

10093
- uses: r-lib/actions/setup-pandoc@v1
10194

.github/workflows/cmdstan-tarball-check.yaml

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
config:
25-
- {os: macOS-latest, r: 'release'}
26-
- {os: windows-latest, r: 'release'}
27-
- {os: ubuntu-20.04, r: 'release'}
25+
- {os: macOS-latest, r: 'release', rtools: ''}
26+
- {os: windows-latest, r: 'release', rtools: '42'}
27+
- {os: ubuntu-20.04, r: 'release', rtools: ''}
2828
env:
2929
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
3030
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
@@ -33,38 +33,18 @@ jobs:
3333

3434
steps:
3535
- uses: actions/checkout@v3
36-
37-
- name: Set path for RTools 4.0
38-
if: runner.os == 'Windows'
39-
run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
40-
41-
- name: Install mingw32-make and check toolchain path
42-
if: runner.os == 'Windows'
43-
run: |
44-
pacman -Syu mingw-w64-x86_64-make --noconfirm
45-
g++ --version
46-
Get-Command g++ | Select-Object -ExpandProperty Definition
47-
mingw32-make --version
48-
Get-Command mingw32-make | Select-Object -ExpandProperty Definition
49-
shell: powershell
50-
5136
- name: Install system dependencies
5237
if: runner.os == 'Linux'
5338
run: |
5439
sudo apt-get update
5540
sudo apt-get install -y libcurl4-openssl-dev || true
5641
sudo apt-get install -y openmpi-bin openmpi-common libopenmpi-dev || true
57-
- uses: r-lib/actions/setup-r@v1
42+
43+
- uses: r-lib/actions/setup-r@v2.2.3
5844
with:
5945
r-version: ${{ matrix.config.r }}
60-
- name: Install Rtools42
61-
if: runner.os == 'Windows'
62-
run: |
63-
$source = 'https://cran.r-project.org/bin/windows/Rtools/rtools42/files/rtools42-5253-5107.exe'
64-
$destination = '../rtools42.exe'
65-
Invoke-WebRequest -Uri $source -OutFile $destination
66-
Start-Process -FilePath ../rtools42.exe -ArgumentList /VERYSILENT -NoNewWindow -Wait
67-
shell: powershell
46+
rtools-version: ${{ matrix.config.rtools }}
47+
6848
- uses: r-lib/actions/setup-pandoc@v1
6949

7050
- name: Query dependencies

0 commit comments

Comments
 (0)