From 407fd405320fb772c2b27a6fd66ab053236d937c Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Tue, 20 Aug 2024 07:48:07 -0500 Subject: [PATCH 1/3] Skip one more test on macOS --- ChangeLog | 5 +++++ inst/tinytest/test_sugar.R | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5e92d0d11..f554d8df3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2024-08-20 Dirk Eddelbuettel + + * inst/tinytest/test_sugar.R: Skip one more NA related test on arm64 + and macOS as failure is seen at r-universe on arm64 + 2024-08-19 Dirk Eddelbuettel * Contributing.md: Refreshed content diff --git a/inst/tinytest/test_sugar.R b/inst/tinytest/test_sugar.R index 2924e83d0..a751fa3fe 100644 --- a/inst/tinytest/test_sugar.R +++ b/inst/tinytest/test_sugar.R @@ -1567,7 +1567,7 @@ expect_error(strimws(x[1], "invalid"), info = "strimws -- bad `which` argument") ## min/max # test.sugar.min.max <- function() { ## min(empty) gives NA for integer, Inf for numeric (#844) -expect_true(is.na(intmin(integer(0))), "min(integer(0))") +if (!isArmMacOs) expect_true(is.na(intmin(integer(0))), "min(integer(0))") if (!isArmMacOs) expect_equal(doublemin(numeric(0)), Inf, info = "min(numeric(0))") ## max(empty_ gives NA for integer, Inf for numeric (#844) From fdf6385d5279706e1c51346fe6cf3b4ee747f29d Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Tue, 20 Aug 2024 08:59:09 -0500 Subject: [PATCH 2/3] Add macOS-only CI runner --- .github/workflows/macos.yaml | 40 ++++++++++++++++++++++++++++++++++++ ChangeLog | 3 +++ 2 files changed, 43 insertions(+) create mode 100644 .github/workflows/macos.yaml diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml new file mode 100644 index 000000000..62a9de6bd --- /dev/null +++ b/.github/workflows/macos.yaml @@ -0,0 +1,40 @@ +# Run CI for R using https://eddelbuettel.github.io/r-ci/ + +name: ci + +on: + push: + pull_request: + +env: + _R_CHECK_FORCE_SUGGESTS_: "false" + +jobs: + ci: + strategy: + matrix: + include: + - {os: macOS-latest} + #- {os: ubuntu-latest} + + runs-on: ${{ matrix.os }} + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup + uses: eddelbuettel/github-actions/r-ci-setup@master + + - name: Bootstrap + run: ./run.sh bootstrap + + - name: Dependencies + run: ./run.sh install_deps + + - name: Test + run: ./run.sh run_tests + + #- name: Coverage + # if: ${{ matrix.os == 'ubuntu-latest' }} + # run: ./run.sh coverage diff --git a/ChangeLog b/ChangeLog index f554d8df3..8355e95d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * inst/tinytest/test_sugar.R: Skip one more NA related test on arm64 and macOS as failure is seen at r-universe on arm64 + * .github/workflows/macos.yaml: Add basic r-ci setup but dialed-down + to macOS only (as Linux is covered via multiple Docker setups) + 2024-08-19 Dirk Eddelbuettel * Contributing.md: Refreshed content From d1f431b10b466b134866d34d754bf6a6e526da85 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Tue, 20 Aug 2024 09:00:32 -0500 Subject: [PATCH 3/3] Adjust name to 'macos' --- .github/workflows/macos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml index 62a9de6bd..c86c6350e 100644 --- a/.github/workflows/macos.yaml +++ b/.github/workflows/macos.yaml @@ -1,6 +1,6 @@ # Run CI for R using https://eddelbuettel.github.io/r-ci/ -name: ci +name: macos on: push: