Skip to content

Commit 5a7481c

Browse files
committed
Update versions tested on CircleCI.
Drop R version 4.3.3 and add version 4.6.0 and updated the R installation suffix handling.
1 parent 46fa835 commit 5a7481c

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

.circleci/config.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,13 @@ jobs:
4848
# the PATCH is ignored (only one patch version supported) the
4949
# architecture is added as a suffix (arm64, x86_64) to allow for
5050
# installations to coexist
51-
rig default "${R_VERSION%.*}-arm64"
51+
# Starting from R 4.6.0, rig no longer appends the architecture suffix
52+
R_MAJOR_MINOR="${R_VERSION%.*}"
53+
if [ "$(printf '%s\n' "4.6" "$R_MAJOR_MINOR" | sort -V | head -n1)" = "4.6" ]; then
54+
rig default "$R_MAJOR_MINOR"
55+
else
56+
rig default "${R_MAJOR_MINOR}-arm64"
57+
fi
5258
elif [ "$RUNNER_OS" == "linux" ]; then
5359
`which sudo` curl -L https://rig.r-pkg.org/deb/rig.gpg -o /etc/apt/trusted.gpg.d/rig.gpg
5460
`which sudo` sh -c 'echo "deb http://rig.r-pkg.org/deb rig main" > /etc/apt/sources.list.d/rig.list'
@@ -93,7 +99,7 @@ workflows:
9399
- r-build:
94100
matrix:
95101
parameters:
96-
r-version: ['4.3.3', '4.4.3', '4.5.3']
102+
r-version: ['4.4.3', '4.5.3', '4.6.0']
97103
os: ["macos-arm"]
98104
filters:
99105
branches:

0 commit comments

Comments
 (0)