Skip to content

CI Windows fixes #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rok-cesnovar merged 3 commits into from
Jul 8, 2022
Merged

CI Windows fixes #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79374bc
a couple of windows fixes
rok-cesnovar Jun 12, 2022
b475e9e
Merge branch 'master' into windows-fixes
rok-cesnovar Jul 8, 2022
f21d373
more CI fixes
rok-cesnovar Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 10 additions & 18 deletions .github/workflows/R-CMD-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'devel'}
- {os: macOS-latest, r: 'release'}
- {os: windows-latest, r: 'devel'}
- {os: windows-latest, r: 'release'}
- {os: windows-latest, r: 'oldrel'}
- {os: ubuntu-20.04, r: 'devel'}
- {os: ubuntu-20.04, r: 'release'}
- {os: ubuntu-20.04, r: 'oldrel'}
- {os: macOS-latest, r: 'devel', rtools: ''}
- {os: macOS-latest, r: 'release', rtools: ''}
- {os: windows-latest, r: 'devel', rtools: '42'}
- {os: windows-latest, r: 'release', rtools: '42'}
- {os: windows-latest, r: 'oldrel', rtools: '40'}
- {os: ubuntu-20.04, r: 'devel', rtools: ''}
- {os: ubuntu-20.04, r: 'release', rtools: ''}
- {os: ubuntu-20.04, r: 'oldrel', rtools: ''}
env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -56,17 +56,10 @@ jobs:
sudo apt-get install -y libcurl4-openssl-dev || true
sudo apt-get install -y openmpi-bin openmpi-common libopenmpi-dev || true

- uses: r-lib/actions/setup-r@v2
- uses: r-lib/actions/setup-r@v2.2.3
with:
r-version: ${{ matrix.config.r }}
- name: Install Rtools42
if: runner.os == 'Windows'
run: |
$source = 'https://cran.r-project.org/bin/windows/Rtools/rtools42/files/rtools42-5253-5107.exe'
$destination = '../rtools42.exe'
Invoke-WebRequest -Uri $source -OutFile $destination
Start-Process -FilePath ../rtools42.exe -ArgumentList /VERYSILENT -NoNewWindow -Wait
shell: powershell
rtools-version: ${{ matrix.config.rtools }}
- uses: r-lib/actions/setup-pandoc@v1

- name: Query dependencies
Expand Down Expand Up @@ -94,7 +87,6 @@ jobs:

- name: Install cmdstan
run: |
print(list.files("C:/rtools42"))
cmdstanr::check_cmdstan_toolchain(fix = TRUE)
cmdstanr::install_cmdstan(cores = 2)
shell: Rscript {0}
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/Test-coverage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,10 @@ jobs:
steps:
- uses: actions/checkout@v3

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

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

Expand Down
34 changes: 7 additions & 27 deletions .github/workflows/cmdstan-tarball-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-20.04, r: 'release'}
- {os: macOS-latest, r: 'release', rtools: ''}
- {os: windows-latest, r: 'release', rtools: '42'}
- {os: ubuntu-20.04, r: 'release', rtools: ''}
env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -33,38 +33,18 @@ jobs:

steps:
- uses: actions/checkout@v3

- name: Set path for RTools 4.0
if: runner.os == 'Windows'
run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8

- name: Install mingw32-make and check toolchain path
if: runner.os == 'Windows'
run: |
pacman -Syu mingw-w64-x86_64-make --noconfirm
g++ --version
Get-Command g++ | Select-Object -ExpandProperty Definition
mingw32-make --version
Get-Command mingw32-make | Select-Object -ExpandProperty Definition
shell: powershell

- name: Install system dependencies
if: runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt-get install -y libcurl4-openssl-dev || true
sudo apt-get install -y openmpi-bin openmpi-common libopenmpi-dev || true
- uses: r-lib/actions/setup-r@v1

- uses: r-lib/actions/setup-r@v2.2.3
with:
r-version: ${{ matrix.config.r }}
- name: Install Rtools42
if: runner.os == 'Windows'
run: |
$source = 'https://cran.r-project.org/bin/windows/Rtools/rtools42/files/rtools42-5253-5107.exe'
$destination = '../rtools42.exe'
Invoke-WebRequest -Uri $source -OutFile $destination
Start-Process -FilePath ../rtools42.exe -ArgumentList /VERYSILENT -NoNewWindow -Wait
shell: powershell
rtools-version: ${{ matrix.config.rtools }}

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

- name: Query dependencies
Expand Down
5 changes: 3 additions & 2 deletions tests/testthat/test-model-compile.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ test_that("compilation works with include_paths", {

expect_interactive_message(
mod_w_include <- cmdstan_model(stan_file = stan_program_w_include, quiet = TRUE,
include_paths = test_path("resources", "stan")),
include_paths = test_path("resources", "stan"),
force_recompile = TRUE),
"Compiling Stan program"
)
expect_equal(
Expand Down Expand Up @@ -580,7 +581,7 @@ test_that("cmdstan_model errors with no args ", {
})

test_that("cmdstan_model works with user_header", {
skip_if(os_is_macos())
skip_if(os_is_macos() | os_is_windows())
tmpfile <- tempfile(fileext = ".hpp")
hpp <-
"
Expand Down