mirror of
https://github.com/gbdev/rgbds.git
synced 2026-08-19 05:14:31 +00:00
Update external testing CI with libbet's new way of running Python
libbet now uses `py -3` if the `py` binary exists, instead of 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 Cygwin's `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.
This commit is contained in:
@@ -337,9 +337,12 @@ jobs:
|
||||
fail-fast: false
|
||||
runs-on: windows-2022
|
||||
timeout-minutes: 30
|
||||
env:
|
||||
CYGWIN_NOWINPATH: 1
|
||||
CHERE_INVOKING: 1
|
||||
defaults:
|
||||
run:
|
||||
shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -eo igncr '{0}'
|
||||
shell: C:\cygwin\bin\bash.exe -leo igncr '{0}'
|
||||
steps:
|
||||
- name: Save Windows git location for the PATH
|
||||
shell: pwsh
|
||||
@@ -368,8 +371,8 @@ jobs:
|
||||
make -k -j "$(getconf _NPROCESSORS_ONLN)" Q=
|
||||
- name: Install using Make
|
||||
if: matrix.arch == 'x86'
|
||||
run: | # `/usr/local/bin` is not in the PATH but `/usr/bin` is, so we install to `/usr`.
|
||||
make install PREFIX=/usr Q=
|
||||
run: |
|
||||
make install Q=
|
||||
type rgbasm rgblink rgbfix rgbgfx
|
||||
man -w 1 rgbasm rgblink rgbfix rgbgfx
|
||||
- name: Build using CMake
|
||||
@@ -379,8 +382,8 @@ jobs:
|
||||
cmake --build build -- -k 0
|
||||
- name: Install using CMake
|
||||
if: matrix.arch == 'x86_64'
|
||||
run: | # `/usr/local/bin` is not in the PATH but `/usr/bin` is, so we install to `/usr`.
|
||||
cmake --install build --prefix /usr --verbose
|
||||
run: |
|
||||
cmake --install build --verbose
|
||||
type rgbasm rgblink rgbfix rgbgfx
|
||||
man -w 1 rgbasm rgblink rgbfix rgbgfx
|
||||
- name: Compute test dependency cache params
|
||||
@@ -407,8 +410,7 @@ jobs:
|
||||
test/run-tests.sh --os cygwin --only-internal --jobs "$(getconf _NPROCESSORS_ONLN)"
|
||||
- name: Run tests using CTest
|
||||
if: matrix.arch == 'x86_64'
|
||||
run: | # The external test repo `libbet` uses `py -3` instead of `python3` if `COMSPEC` is defined, so we clear it.
|
||||
unset COMSPEC
|
||||
run: |
|
||||
ctest --test-dir build --schedule-random
|
||||
- name: Use Windows git location in the PATH
|
||||
shell: pwsh
|
||||
|
||||
Vendored
+1
-1
@@ -1,7 +1,7 @@
|
||||
EXT_TEST_OWNER=pinobatch
|
||||
EXT_TEST_REPO=libbet
|
||||
EXT_TEST_DOMAIN=github.com
|
||||
EXT_TEST_COMMIT=e42c0036b18e6e715987b88b4973389b283974c9
|
||||
EXT_TEST_COMMIT=1232e71dc1ac852786ad9825316e19d2b341bc4a
|
||||
EXT_TEST_IS_NONFREE=false
|
||||
|
||||
EXT_TEST_TARGET=all
|
||||
|
||||
Reference in New Issue
Block a user