Skip to content

Commit 4634e78

Browse files
committed
Fix CI testing of installing RGBDS on Cygwin
We need to pass `-e` to Cygwin `bash` explicitly, since specifying it as the non-default `shell:` no longer automatically adds `-e` behavior to `run` blocks. We also need to install to `/usr/bin` (which `cygwin-install-action` automatically adds to the `PATH`), not `/usr/local/bin` (which is not in the default `PATH`). This tests our `PREFIX`/`--prefix` handling.
1 parent 4384223 commit 4634e78

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/testing.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ jobs:
339339
timeout-minutes: 30
340340
defaults:
341341
run:
342-
shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -o igncr '{0}'
342+
shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -eo igncr '{0}'
343343
steps:
344344
- name: Save Windows git location for the PATH
345345
shell: pwsh
@@ -368,8 +368,8 @@ jobs:
368368
make -k -j "$(getconf _NPROCESSORS_ONLN)" Q=
369369
- name: Install using Make
370370
if: matrix.arch == 'x86'
371-
run: |
372-
make install Q=
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=
373373
type rgbasm rgblink rgbfix rgbgfx
374374
man -w 1 rgbasm rgblink rgbfix rgbgfx
375375
- name: Build using CMake
@@ -379,8 +379,8 @@ jobs:
379379
cmake --build build -- -k 0
380380
- name: Install using CMake
381381
if: matrix.arch == 'x86_64'
382-
run: |
383-
cmake --install build --verbose
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
384384
type rgbasm rgblink rgbfix rgbgfx
385385
man -w 1 rgbasm rgblink rgbfix rgbgfx
386386
- name: Compute test dependency cache params

0 commit comments

Comments
 (0)