encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CI: Fix CMake workflow. 

- Add quotes the OSX_ARCHITECTURES list.
- Extract the flag in the matrix.
This commit is contained in:
Pierre Wendling 2022-07-26 15:42:01 -04:00 committed by Ozkan Sezer
parent cc982ea7a7
commit 36d456797b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
- { name: Windows (mingw64+clang), os: windows-latest, shell: 'msys2 {0}', msystem: mingw64, msys-env: mingw-w64-x86_64, cc: clang } - { name: Windows (mingw64+clang), os: windows-latest, shell: 'msys2 {0}', msystem: mingw64, msys-env: mingw-w64-x86_64, cc: clang }
- { name: Linux (CMake), os: ubuntu-20.04, shell: sh } - { name: Linux (CMake), os: ubuntu-20.04, shell: sh }
- { name: Linux (autotools), os: ubuntu-20.04, shell: sh, autotools: true } - { name: Linux (autotools), os: ubuntu-20.04, shell: sh, autotools: true }
- { name: MacOS (CMake), os: macos-latest, shell: sh } - { name: MacOS (CMake), os: macos-latest, shell: sh, cmake: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"' }
- { name: MacOS (autotools), os: macos-latest, shell: sh, autotools: true } - { name: MacOS (autotools), os: macos-latest, shell: sh, autotools: true }
steps: steps:
@ -109,7 +109,7 @@ jobs:
-DSDL_INSTALL_TESTS=ON \ -DSDL_INSTALL_TESTS=ON \
-DCMAKE_INSTALL_PREFIX=cmake_prefix \ -DCMAKE_INSTALL_PREFIX=cmake_prefix \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 ${{ matrix.platform.cmake }}
- name: Build (CMake) - name: Build (CMake)
if: "! matrix.platform.autotools" if: "! matrix.platform.autotools"
run: | run: |