From 291941f4e29d98e4c896882e7fbc491db079e14a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Tue, 3 Nov 2020 10:54:12 +0100 Subject: [PATCH] [.github/workflows] CI: use msys2/setup-msys2 instead of numworks/setup-msys2 --- .github/workflows/ci-workflow.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 5a3a787fd..849adb776 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -64,14 +64,17 @@ jobs: path: output/release/device/n0110/epsilon.dfu windows: runs-on: windows-latest + defaults: + run: + shell: msys2 {0} steps: - - uses: numworks/setup-msys2@v1 + - uses: msys2/setup-msys2@v2 - uses: actions/checkout@v2 - - run: msys2do pacman -S --noconfirm mingw-w64-x86_64-gcc mingw-w64-x86_64-freetype mingw-w64-x86_64-pkg-config make mingw-w64-x86_64-python3 mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libpng - - run: msys2do make -j2 PLATFORM=simulator - - run: msys2do make -j2 PLATFORM=simulator epsilon.official.exe - - run: msys2do make -j2 PLATFORM=simulator test.headless.exe - - run: cmd /c output\release\simulator\windows\test.headless.exe + - run: pacman -S --noconfirm mingw-w64-x86_64-gcc mingw-w64-x86_64-freetype mingw-w64-x86_64-pkg-config make mingw-w64-x86_64-python3 mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libpng + - run: make -j2 PLATFORM=simulator + - run: make -j2 PLATFORM=simulator epsilon.official.exe + - run: make -j2 PLATFORM=simulator test.headless.exe + - run: output/release/simulator/windows/test.headless.exe - uses: actions/upload-artifact@master with: name: epsilon-windows.exe