Skip to content

Commit c31fc5a

Browse files
committed
Update external testing CI with libbet's new way of setting Python
libbet now uses `py -3` if `py` exist, rather than if `COMSPEC` is defined, so we don't need to `unset COMSPEC`, we just need to avoid Windows' `py` launcher from being in Cygwin's `PATH`. It turns out that `C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 ...` was not effectively preventing Windows' `PATH` from being inherited by the Cygwin `PATH`, because to take effect it needs to run Cygwin's `/etc/profile` script; the simple way to do that is using a login shell. So we don't need the `PREFIX`/`--prefix` from the previous commit after all.
1 parent 6f64fd0 commit c31fc5a

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

.github/workflows/testing.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,12 @@ jobs:
337337
fail-fast: false
338338
runs-on: windows-2022
339339
timeout-minutes: 30
340+
env:
341+
CYGWIN_NOWINPATH: 1
342+
CHERE_INVOKING: 1
340343
defaults:
341344
run:
342-
shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -eo igncr '{0}'
345+
shell: C:\cygwin\bin\bash.exe -leo igncr '{0}'
343346
steps:
344347
- name: Save Windows git location for the PATH
345348
shell: pwsh
@@ -368,8 +371,8 @@ jobs:
368371
make -k -j "$(getconf _NPROCESSORS_ONLN)" Q=
369372
- name: Install using Make
370373
if: matrix.arch == 'x86'
371-
run: | # `/usr/local/bin` is not in the PATH but `/usr/bin` is, so we install to `/usr`.
372-
make install PREFIX=/usr Q=
374+
run: |
375+
make install Q=
373376
type rgbasm rgblink rgbfix rgbgfx
374377
man -w 1 rgbasm rgblink rgbfix rgbgfx
375378
- name: Build using CMake
@@ -379,8 +382,8 @@ jobs:
379382
cmake --build build -- -k 0
380383
- name: Install using CMake
381384
if: matrix.arch == 'x86_64'
382-
run: | # `/usr/local/bin` is not in the PATH but `/usr/bin` is, so we install to `/usr`.
383-
cmake --install build --prefix /usr --verbose
385+
run: |
386+
cmake --install build --verbose
384387
type rgbasm rgblink rgbfix rgbgfx
385388
man -w 1 rgbasm rgblink rgbfix rgbgfx
386389
- name: Compute test dependency cache params
@@ -407,8 +410,7 @@ jobs:
407410
test/run-tests.sh --os cygwin --only-internal --jobs "$(getconf _NPROCESSORS_ONLN)"
408411
- name: Run tests using CTest
409412
if: matrix.arch == 'x86_64'
410-
run: | # The external test repo `libbet` uses `py -3` instead of `python3` if `COMSPEC` is defined, so we clear it.
411-
unset COMSPEC
413+
run: |
412414
ctest --test-dir build --schedule-random
413415
- name: Use Windows git location in the PATH
414416
shell: pwsh

test/external/libbet.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
EXT_TEST_OWNER=pinobatch
22
EXT_TEST_REPO=libbet
33
EXT_TEST_DOMAIN=github.com
4-
EXT_TEST_COMMIT=e42c0036b18e6e715987b88b4973389b283974c9
4+
EXT_TEST_COMMIT=1232e71dc1ac852786ad9825316e19d2b341bc4a
55
EXT_TEST_IS_NONFREE=false
66

77
EXT_TEST_TARGET=all

0 commit comments

Comments
 (0)