Skip to content

Commit

Permalink
Fixed a permission error on the GitHub MinGW builder
Browse files Browse the repository at this point in the history
  • Loading branch information
mmatyas committed Oct 27, 2023
1 parent 406c743 commit 6f828e4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y cmake g++-mingw-w64-i686-posix ninja-build
curl -L https://github.com/mmatyas/supermariowar/releases/download/v2.0-beta.0/smwlibs-mingw.tar.xz | tar xJf - -C /
rm /opt/smwlibs/lib/{libzlib.a,libzlib.dll.a}
curl -L https://github.com/mmatyas/supermariowar/releases/download/v2.0-beta.0/smwlibs-mingw.tar.xz | tar xJf - -C /tmp/
rm /tmp/smwlibs/lib/{libzlib.a,libzlib.dll.a}
cmake --version
- name: Configure
Expand All @@ -34,7 +34,7 @@ jobs:
rm -rf supermariowar/include supermariowar/lib
cp /usr/lib/gcc/i686-w64-mingw32/10-posix/{libgcc_s_dw2-1,libstdc++-6}.dll supermariowar/
cp /usr/i686-w64-mingw32/lib/libwinpthread-1.dll supermariowar/
cp /opt/smwlibs/bin/{SDL2,SDL2_image,SDL2_mixer_ext}.dll supermariowar/
cp /tmp/smwlibs/bin/{SDL2,SDL2_image,SDL2_mixer_ext}.dll supermariowar/
zip -r "supermariowar_$(date +%F)_windows.zip" supermariowar
- name: Upload artifacts
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mingw_toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ set(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
set(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres)

set(CMAKE_SYSROOT /opt/smwlibs)
set(CMAKE_FIND_ROOT_PATH /opt/smwlibs)
set(CMAKE_SYSROOT /tmp/smwlibs)
set(CMAKE_FIND_ROOT_PATH /tmp/smwlibs)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
Expand Down

0 comments on commit 6f828e4

Please sign in to comment.