Skip to content

Commit 099dd73

Browse files
committed
And of course arm64 == aarch64 on leenucks
1 parent f8be28c commit 099dd73

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

.github/workflows/macos.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ jobs:
2828
- name: Setup
2929
uses: eddelbuettel/github-actions/r-ci@master
3030

31-
- name: Sys.info
32-
run: Rscript -e 'print(Sys.info()); print(.Platform)'
33-
3431
- name: Dependencies
3532
run: ./run.sh install_deps
3633

inst/tinytest/test_sugar.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ Rcpp::sourceCpp("cpp/sugar.cpp")
2424
## There are some (documented, see https://blog.r-project.org/2020/11/02/will-r-work-on-apple-silicon/index.html)
2525
## issues with NA propagation on arm64 / macOS. We not (yet ?) do anything special so we just skip some tests
2626
isArmMacOs <- Sys.info()[["sysname"]] == "Darwin" && Sys.info()[["machine"]] == "arm64"
27-
## This also seems to hit arm64 on Linux
28-
isArmLinux <- Sys.info()[["sysname"]] == "Linux" && Sys.info()[["machine"]] == "arm64"
27+
## This also seems to hit arm64 on Linux (aka 'aarch64' here)
28+
isArmLinux <- Sys.info()[["sysname"]] == "Linux" && Sys.info()[["machine"]] == "aarch64"
2929

3030
## Needed for a change in R 3.6.0 reducing a bias in very large samples
3131
suppressWarnings(RNGversion("3.5.0"))

0 commit comments

Comments
 (0)