Skip to content

Commit

Permalink
Merge branch 'master' into feature/fit-inits
Browse files Browse the repository at this point in the history
  • Loading branch information
andrjohns committed Apr 19, 2024
2 parents e867c24 + 30c945c commit 12974f7
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 18 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/R-CMD-check-wsl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,8 @@ jobs:

- uses: actions/checkout@v4

- uses: r-lib/actions/[email protected]
with:
r-version: 'release'
rtools-version: '43'
- uses: r-lib/actions/[email protected]
- uses: r-lib/actions/[email protected]
- uses: r-lib/actions/[email protected]

- name: Query dependencies
run: |
Expand All @@ -58,7 +55,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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected].6
- uses: r-lib/actions/[email protected].7
with:
r-version: ${{ matrix.config.r }}
rtools-version: ${{ matrix.config.rtools }}
- uses: r-lib/actions/[email protected].6
- uses: r-lib/actions/[email protected].7

- name: Query dependencies
run: |
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/Test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
- uses: actions/checkout@v4

- uses: r-lib/actions/[email protected].6
- uses: r-lib/actions/[email protected].6
- uses: r-lib/actions/[email protected].7
- uses: r-lib/actions/[email protected].7

- name: Install Ubuntu dependencies
run: |
Expand Down Expand Up @@ -85,12 +85,9 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/[email protected]
with:
r-version: 'release'
rtools-version: '43'
- uses: r-lib/actions/[email protected]

- uses: r-lib/actions/[email protected].6
- uses: r-lib/actions/[email protected].7

- name: Query dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cmdstan-tarball-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected].6
- uses: r-lib/actions/[email protected].7
with:
r-version: ${{ matrix.config.r }}
rtools-version: ${{ matrix.config.rtools }}

- uses: r-lib/actions/[email protected].6
- uses: r-lib/actions/[email protected].7

- name: Query dependencies
run: |
Expand Down
4 changes: 3 additions & 1 deletion R/install.R
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 12974f7

Please sign in to comment.