ci: add macos-15-intel to matrix (#4968)
And fix a stupid typo that made GHA skip running the tests 🤦
This commit is contained in:
parent
504887a339
commit
ac591507f3
6
.github/workflows/CI-unix.yml
vendored
6
.github/workflows/CI-unix.yml
vendored
@ -80,7 +80,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [macos-14, macos-15]
|
os: [macos-14, macos-15, macos-15-intel]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- name: Envinfo
|
- name: Envinfo
|
||||||
@ -107,11 +107,11 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
./build/uv_run_tests_a platform_output
|
./build/uv_run_tests_a platform_output
|
||||||
- name: Test
|
- name: Test
|
||||||
if: ${{ maxtrix.os == 'macos-15' }}
|
if: ${{ matrix.os == 'macos-15' || matrix.os == 'macos-15-intel' }}
|
||||||
run: |
|
run: |
|
||||||
cd build && sudo UV_RUN_AS_ROOT=1 ctest -V
|
cd build && sudo UV_RUN_AS_ROOT=1 ctest -V
|
||||||
- name: Test
|
- name: Test
|
||||||
if: ${{ maxtrix.os != 'macos-15' }}
|
if: ${{ matrix.os != 'macos-15' && matrix.os != 'macos-15-intel' }}
|
||||||
run: |
|
run: |
|
||||||
cd build && ctest -V
|
cd build && ctest -V
|
||||||
- name: Autotools configure
|
- name: Autotools configure
|
||||||
|
|||||||
@ -220,8 +220,13 @@ TEST_IMPL(fs_copyfile) {
|
|||||||
r = uv_fs_copyfile(NULL, &req, fixture, dst, 0, NULL);
|
r = uv_fs_copyfile(NULL, &req, fixture, dst, 0, NULL);
|
||||||
/* On IBMi PASE, qsecofr users can overwrite read-only files */
|
/* On IBMi PASE, qsecofr users can overwrite read-only files */
|
||||||
# ifndef __PASE__
|
# ifndef __PASE__
|
||||||
ASSERT_EQ(req.result, UV_EACCES);
|
if (0 == getuid()) { /* If root. */
|
||||||
ASSERT_EQ(r, UV_EACCES);
|
ASSERT_EQ(req.result, 0);
|
||||||
|
ASSERT_EQ(r, 0);
|
||||||
|
} else {
|
||||||
|
ASSERT_EQ(req.result, UV_EACCES);
|
||||||
|
ASSERT_EQ(r, UV_EACCES);
|
||||||
|
}
|
||||||
# endif
|
# endif
|
||||||
uv_fs_req_cleanup(&req);
|
uv_fs_req_cleanup(&req);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user