From ac591507f3ff7383b8a56351aa2fda33dbd80ee5 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Wed, 10 Dec 2025 20:43:08 +0100 Subject: [PATCH] ci: add macos-15-intel to matrix (#4968) And fix a stupid typo that made GHA skip running the tests :facepalm: --- .github/workflows/CI-unix.yml | 6 +++--- test/test-fs-copyfile.c | 9 +++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI-unix.yml b/.github/workflows/CI-unix.yml index d9ea1b5c2..6b82ae5b5 100644 --- a/.github/workflows/CI-unix.yml +++ b/.github/workflows/CI-unix.yml @@ -80,7 +80,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-14, macos-15] + os: [macos-14, macos-15, macos-15-intel] steps: - uses: actions/checkout@v6 - name: Envinfo @@ -107,11 +107,11 @@ jobs: run: | ./build/uv_run_tests_a platform_output - name: Test - if: ${{ maxtrix.os == 'macos-15' }} + if: ${{ matrix.os == 'macos-15' || matrix.os == 'macos-15-intel' }} run: | cd build && sudo UV_RUN_AS_ROOT=1 ctest -V - name: Test - if: ${{ maxtrix.os != 'macos-15' }} + if: ${{ matrix.os != 'macos-15' && matrix.os != 'macos-15-intel' }} run: | cd build && ctest -V - name: Autotools configure diff --git a/test/test-fs-copyfile.c b/test/test-fs-copyfile.c index f7a0c2363..bd830ff07 100644 --- a/test/test-fs-copyfile.c +++ b/test/test-fs-copyfile.c @@ -220,8 +220,13 @@ TEST_IMPL(fs_copyfile) { r = uv_fs_copyfile(NULL, &req, fixture, dst, 0, NULL); /* On IBMi PASE, qsecofr users can overwrite read-only files */ # ifndef __PASE__ - ASSERT_EQ(req.result, UV_EACCES); - ASSERT_EQ(r, UV_EACCES); + if (0 == getuid()) { /* If root. */ + ASSERT_EQ(req.result, 0); + ASSERT_EQ(r, 0); + } else { + ASSERT_EQ(req.result, UV_EACCES); + ASSERT_EQ(r, UV_EACCES); + } # endif uv_fs_req_cleanup(&req); #endif