1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00

move to setup-msys2 action

much less clunky config as a bonus
This commit is contained in:
still-flow 2020-09-22 23:17:16 +03:00
parent 4970b6af25
commit efc2766849
2 changed files with 13 additions and 5 deletions

View File

@ -48,10 +48,16 @@ jobs:
hyper_use_rviz: [rviz_1, rviz_0]
hyper_use_png: [png_1]
hyper_use_glew: [glew_1]
defaults:
run:
shell: msys2 {0}
steps:
- uses: msys2/setup-msys2@v2
with:
update: true
install: 'pactoys'
- uses: actions/checkout@v2
- name: envvars_setup
shell: cmd.exe /D /E:ON /V:OFF /C "C:\msys64\msys2_shell.cmd -defterm -msys2 -no-start -full-path -here {0}"
run: |
cat << ENDOFVARS > .github/workflows/gh_ci_envvars.sh
GH_OS=${{ matrix.os }}
@ -62,11 +68,13 @@ jobs:
GH_HYP_GLEW=${{ matrix.hyper_use_glew }}
ENDOFVARS
- name: install_deps
run: cmd.exe /D /E:ON /V:OFF /C "C:\msys64\msys2_shell.cmd -defterm -msys2 -no-start -full-path -here .github/workflows/install_deps.sh"
env:
MSYSTEM: MSYS
run: .github/workflows/install_deps.sh
- name: build
run: cmd.exe /D /E:ON /V:OFF /C "C:\msys64\msys2_shell.cmd -defterm -mingw64 -no-start -full-path -here .github/workflows/build.sh"
run: .github/workflows/build.sh
- name: test_simple
run: cmd.exe /D /E:ON /V:OFF /C "C:\msys64\msys2_shell.cmd -defterm -mingw64 -no-start -full-path -here .github/workflows/test_simple.sh"
run: .github/workflows/test_simple.sh
emscripten:
runs-on: ubuntu-latest

View File

@ -4,7 +4,7 @@ source .github/workflows/gh_ci_envvars.sh
GH_DEPS_UBUNTU="$GH_COMPILER libsdl1.2-dev libsdl-ttf2.0-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev"
GH_DEPS_MACOS="sdl sdl_gfx sdl_mixer sdl_ttf"
GH_DEPS_MINGW64="$GH_COMPILER:x SDL:x SDL_ttf:x SDL_gfx:x SDL_mixer:x"
GH_DEPS_MINGW64="$GH_COMPILER:x SDL:x SDL_ttf:x SDL_gfx:x SDL_mixer:x make"
if [[ "$GH_HYP_GLEW" == "glew_1" ]]; then
GH_DEPS_UBUNTU+=" libglew-dev"