From 5b712af92ac1f04ceed904da8ee354090a7a4d02 Mon Sep 17 00:00:00 2001 From: Sebastian Funk Date: Mon, 23 Oct 2023 18:26:38 +0100 Subject: [PATCH] Revert "manually install up-to-date rstan" This reverts commit 9b30403c7bb8bcccddbb919d980172f3f828dde1. --- .github/workflows/R-CMD-check.yaml | 13 +------------ .github/workflows/test-coverage.yaml | 10 +--------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 665b6a875..32d8420a6 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -34,8 +34,7 @@ jobs: matrix: config: - {os: macOS-latest, r: 'release', rtools: ''} - ## to reactivate once rstan is updated on CRAN - ## - {os: windows-latest, r: 'release', rtools: '42'} + - {os: windows-latest, r: 'release', rtools: '42'} - {os: ubuntu-latest, r: 'release', rtools: ''} - {os: ubuntu-latest, r: 'oldrel-1', rtools: ''} - {os: ubuntu-latest, r: 'devel', rtools: ''} @@ -55,8 +54,6 @@ jobs: sudo apt-get install -y libcurl4-openssl-dev || true sudo apt-get install -y openmpi-bin openmpi-common libopenmpi-dev || true sudo apt-get install -y libpng-dev || true - ## to remove once rstan is updated on CRAN - sudo apt-get install -y libharfbuzz-dev libfribidi-dev || true - uses: r-lib/actions/setup-pandoc@v2 - uses: r-lib/actions/setup-r@v2 @@ -71,14 +68,6 @@ jobs: extra-packages: any::rcmdcheck needs: check - ## to remove once rstan is updated on CRAN - - name: Manually install dev versions of StanHeaders and rstan - run: | - install.packages("devtools") - devtools::install_github("stan-dev/rstan/StanHeaders@develop") - devtools::install_github("stan-dev/rstan/rstan/rstan@develop") - shell: Rscript {0} - - uses: r-lib/actions/check-r-package@v2 with: upload-snapshots: true diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 4738c0def..e9a51d259 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -29,14 +29,6 @@ jobs: extra-packages: any::covr needs: coverage - ## to remove once rstan is updated on CRAN - - name: Manually install dev versions of StanHeaders and rstan - run: | - install.packages("devtools") - devtools::install_github("stan-dev/rstan/StanHeaders@develop") - devtools::install_github("stan-dev/rstan/rstan/rstan@develop") - shell: Rscript {0} - - name: Test coverage run: covr::codecov(quiet = FALSE) - shell: Rscript {0} + shell: Rscript {0} \ No newline at end of file