diff options
author | Dennis Felsing <dennis@felsin9.de> | 2022-02-14 22:34:43 +0100 |
---|---|---|
committer | Robert Müller <robytemueller@gmail.com> | 2023-06-14 17:09:21 +0200 |
commit | e5869f7a6c51b273dfaa3f955552e9e7e84757f0 (patch) | |
tree | d970761bd23c16fdc9a094ff4bd093ed8012b762 | |
parent | 9049272ba2516c75308c417147d7d5e46f33d0e1 (diff) |
Use ninja instead of makefiles
-rw-r--r-- | .github/workflows/build.yaml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7916b6ce9..9465df65e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,22 +10,20 @@ jobs: os: [ubuntu-latest, macOS-latest, windows-latest, ubuntu-20.04] include: - os: ubuntu-latest - cmake-args: -G "Unix Makefiles" - build-args: --parallel + cmake-args: -G Ninja package-file: teeworlds-*-linux_x86_64.tar.xz env: CFLAGS: -Wdeclaration-after-statement -Werror CXXFLAGS: -Werror - os: ubuntu-20.04 cmake-path: /usr/bin/ - cmake-args: -G "Unix Makefiles" + cmake-args: -G Ninja package-file: teeworlds-*-linux_x86_64.tar.xz env: CFLAGS: -Wdeclaration-after-statement -Werror CXXFLAGS: -Werror - os: macOS-latest - cmake-args: -G "Unix Makefiles" - build-args: --parallel + cmake-args: -G Ninja package-file: teeworlds-*-macos.dmg env: CFLAGS: -Wdeclaration-after-statement -Werror @@ -47,13 +45,13 @@ jobs: if: contains(matrix.os, 'ubuntu') run: | sudo apt-get update -y - sudo apt-get install pkg-config cmake libfreetype6-dev libsdl2-dev -y + sudo apt-get install pkg-config cmake ninja-build libfreetype6-dev libsdl2-dev -y - name: Prepare MacOS if: contains(matrix.os, 'macOS') run: | brew update || true - brew install pkg-config sdl2 + brew install pkg-config sdl2 python3 ninja brew upgrade freetype sudo rm -rf /Library/Developer/CommandLineTools |