gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2026-09-18 03:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update external testing CI with libbet's new way of running Python

Browse Source 
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:
Rangi
2026-08-01 04:49:43 +02:00
committed by Eldred Habert
parent 6f64fd00f6
commit 0c772ea049
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/testing.yml
+9 -7
View File
@@ -337,9 +337,12 @@ jobs:
fail-fast: false fail-fast: false
runs-on: windows-2022 runs-on: windows-2022
timeout-minutes: 30 timeout-minutes: 30
env:
CYGWIN_NOWINPATH: 1
CHERE_INVOKING: 1
defaults: defaults:
run: 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: steps:
- name: Save Windows git location for the PATH - name: Save Windows git location for the PATH
shell: pwsh shell: pwsh
@@ -368,8 +371,8 @@ jobs:
make -k -j "$(getconf _NPROCESSORS_ONLN)" Q= make -k -j "$(getconf _NPROCESSORS_ONLN)" Q=
- name: Install using Make - name: Install using Make
if: matrix.arch == 'x86' if: matrix.arch == 'x86'
run: | # `/usr/local/bin` is not in the PATH but `/usr/bin` is, so we install to `/usr`. run: |
make install PREFIX=/usr Q= make install Q=
type rgbasm rgblink rgbfix rgbgfx type rgbasm rgblink rgbfix rgbgfx
man -w 1 rgbasm rgblink rgbfix rgbgfx man -w 1 rgbasm rgblink rgbfix rgbgfx
- name: Build using CMake - name: Build using CMake
@@ -379,8 +382,8 @@ jobs:
cmake --build build -- -k 0 cmake --build build -- -k 0
- name: Install using CMake - name: Install using CMake
if: matrix.arch == 'x86_64' if: matrix.arch == 'x86_64'
run: | # `/usr/local/bin` is not in the PATH but `/usr/bin` is, so we install to `/usr`. run: |
cmake --install build --prefix /usr --verbose cmake --install build --verbose
type rgbasm rgblink rgbfix rgbgfx type rgbasm rgblink rgbfix rgbgfx
man -w 1 rgbasm rgblink rgbfix rgbgfx man -w 1 rgbasm rgblink rgbfix rgbgfx
- name: Compute test dependency cache params - name: Compute test dependency cache params
@@ -407,8 +410,7 @@ jobs:
test/run-tests.sh --os cygwin --only-internal --jobs "$(getconf _NPROCESSORS_ONLN)" test/run-tests.sh --os cygwin --only-internal --jobs "$(getconf _NPROCESSORS_ONLN)"
- name: Run tests using CTest - name: Run tests using CTest
if: matrix.arch == 'x86_64' 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. run: |
unset COMSPEC
ctest --test-dir build --schedule-random ctest --test-dir build --schedule-random
- name: Use Windows git location in the PATH - name: Use Windows git location in the PATH
shell: pwsh shell: pwsh
test/external/libbet.cfg
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
EXT_TEST_OWNER=pinobatch EXT_TEST_OWNER=pinobatch
EXT_TEST_REPO=libbet EXT_TEST_REPO=libbet
EXT_TEST_DOMAIN=github.com EXT_TEST_DOMAIN=github.com
EXT_TEST_COMMIT=e42c0036b18e6e715987b88b4973389b283974c9 EXT_TEST_COMMIT=1232e71dc1ac852786ad9825316e19d2b341bc4a
EXT_TEST_IS_NONFREE=false EXT_TEST_IS_NONFREE=false
EXT_TEST_TARGET=all EXT_TEST_TARGET=all