From 1fe06574e7b2af7f51d6b0572b81be9660b6e3f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 18:08:25 +0000 Subject: [PATCH 1/5] Bump Vampire/setup-wsl from 2 to 3 Bumps [Vampire/setup-wsl](https://github.com/vampire/setup-wsl) from 2 to 3. - [Release notes](https://github.com/vampire/setup-wsl/releases) - [Commits](https://github.com/vampire/setup-wsl/compare/v2...v3) --- updated-dependencies: - dependency-name: Vampire/setup-wsl dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/R-CMD-check-wsl.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check-wsl.yaml b/.github/workflows/R-CMD-check-wsl.yaml index df3c423f..29c9d908 100644 --- a/.github/workflows/R-CMD-check-wsl.yaml +++ b/.github/workflows/R-CMD-check-wsl.yaml @@ -58,7 +58,7 @@ jobs: install.packages("curl") shell: Rscript {0} - - uses: Vampire/setup-wsl@v2 + - uses: Vampire/setup-wsl@v3 with: distribution: Ubuntu-22.04 use-cache: 'false' From 4a6dd9d37ba2efee34a677bf99f7c7bbd0a9578e Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 18 Apr 2024 21:36:13 +0300 Subject: [PATCH 2/5] Add handling for new rtools version --- R/install.R | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/R/install.R b/R/install.R index 7d92f5e9..995c14a9 100644 --- a/R/install.R +++ b/R/install.R @@ -855,8 +855,10 @@ rtools4x_version <- function() { rtools_ver <- "40" } else if (R.version$minor < "3.0") { rtools_ver <- "42" - } else { + } else if (R.version$minor < "5.0") { rtools_ver <- "43" + } else { + rtools_ver <- "44" } rtools_ver } From 920b70b40b105f9365d1cc7ff36a527148d515d1 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 18 Apr 2024 21:41:13 +0300 Subject: [PATCH 3/5] Bump r-lib actions --- .github/workflows/R-CMD-check-wsl.yaml | 4 ++-- .github/workflows/R-CMD-check.yaml | 4 ++-- .github/workflows/Test-coverage.yaml | 8 ++++---- .github/workflows/cmdstan-tarball-check.yaml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/R-CMD-check-wsl.yaml b/.github/workflows/R-CMD-check-wsl.yaml index f0244dff..0535c9bf 100644 --- a/.github/workflows/R-CMD-check-wsl.yaml +++ b/.github/workflows/R-CMD-check-wsl.yaml @@ -37,11 +37,11 @@ jobs: - uses: actions/checkout@v4 - - uses: r-lib/actions/setup-r@v2.8.4 + - uses: r-lib/actions/setup-r@v2.8.7 with: r-version: 'release' rtools-version: '42' - - uses: r-lib/actions/setup-pandoc@v2.8.4 + - uses: r-lib/actions/setup-pandoc@v2.8.7 - name: Query dependencies run: | diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 9e22daf0..9830ff5d 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -57,11 +57,11 @@ 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.8.4 + - uses: r-lib/actions/setup-r@v2.8.7 with: r-version: ${{ matrix.config.r }} rtools-version: ${{ matrix.config.rtools }} - - uses: r-lib/actions/setup-pandoc@v2.8.4 + - uses: r-lib/actions/setup-pandoc@v2.8.7 - name: Query dependencies run: | diff --git a/.github/workflows/Test-coverage.yaml b/.github/workflows/Test-coverage.yaml index 428e9e6e..7e32303d 100644 --- a/.github/workflows/Test-coverage.yaml +++ b/.github/workflows/Test-coverage.yaml @@ -34,8 +34,8 @@ jobs: if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'" - uses: actions/checkout@v4 - - uses: r-lib/actions/setup-r@v2.8.4 - - uses: r-lib/actions/setup-pandoc@v2.8.4 + - uses: r-lib/actions/setup-r@v2.8.7 + - uses: r-lib/actions/setup-pandoc@v2.8.7 - name: Install Ubuntu dependencies run: | @@ -85,12 +85,12 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: r-lib/actions/setup-r@v2.8.4 + - uses: r-lib/actions/setup-r@v2.8.7 with: r-version: 'release' rtools-version: '42' - - uses: r-lib/actions/setup-pandoc@v2.8.4 + - uses: r-lib/actions/setup-pandoc@v2.8.7 - name: Query dependencies run: | diff --git a/.github/workflows/cmdstan-tarball-check.yaml b/.github/workflows/cmdstan-tarball-check.yaml index 57769447..d9869f78 100644 --- a/.github/workflows/cmdstan-tarball-check.yaml +++ b/.github/workflows/cmdstan-tarball-check.yaml @@ -40,12 +40,12 @@ 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.8.4 + - uses: r-lib/actions/setup-r@v2.8.7 with: r-version: ${{ matrix.config.r }} rtools-version: ${{ matrix.config.rtools }} - - uses: r-lib/actions/setup-pandoc@v2.8.4 + - uses: r-lib/actions/setup-pandoc@v2.8.7 - name: Query dependencies run: | From 2647de60df592384b328c803f5ea10a75bba272e Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 18 Apr 2024 22:00:11 +0300 Subject: [PATCH 4/5] Fix WSL rtools mismatch --- .github/workflows/R-CMD-check-wsl.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/R-CMD-check-wsl.yaml b/.github/workflows/R-CMD-check-wsl.yaml index 0535c9bf..2beb520a 100644 --- a/.github/workflows/R-CMD-check-wsl.yaml +++ b/.github/workflows/R-CMD-check-wsl.yaml @@ -38,9 +38,6 @@ jobs: - uses: actions/checkout@v4 - uses: r-lib/actions/setup-r@v2.8.7 - with: - r-version: 'release' - rtools-version: '42' - uses: r-lib/actions/setup-pandoc@v2.8.7 - name: Query dependencies From e4c279b2ed308e5bee1af68b5c846b2bbe5716ef Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 18 Apr 2024 22:20:13 +0300 Subject: [PATCH 5/5] Coverage workflow rtools mismatch --- .github/workflows/Test-coverage.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/Test-coverage.yaml b/.github/workflows/Test-coverage.yaml index 7e32303d..311020ef 100644 --- a/.github/workflows/Test-coverage.yaml +++ b/.github/workflows/Test-coverage.yaml @@ -86,9 +86,6 @@ jobs: - uses: actions/checkout@v4 - uses: r-lib/actions/setup-r@v2.8.7 - with: - r-version: 'release' - rtools-version: '42' - uses: r-lib/actions/setup-pandoc@v2.8.7