mirror of
https://github.com/gbdev/rgbds.git
synced 2026-09-04 12:58:38 +00:00
Fix CI testing of installing RGBDS on Cygwin (#2038)
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.
This commit is contained in:
@@ -339,7 +339,7 @@ jobs:
|
|||||||
timeout-minutes: 30
|
timeout-minutes: 30
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -o igncr '{0}'
|
shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -eo 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 +368,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: |
|
run: | # `/usr/local/bin` is not in the PATH but `/usr/bin` is, so we install to `/usr`.
|
||||||
make install Q=
|
make install PREFIX=/usr 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 +379,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: |
|
run: | # `/usr/local/bin` is not in the PATH but `/usr/bin` is, so we install to `/usr`.
|
||||||
cmake --install build --verbose
|
cmake --install build --prefix /usr --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
|
||||||
|
|||||||
Reference in New Issue
Block a user