diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3402fb7e8..fd3acf011 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - name: Windows os: windows-latest os_identifier: win - extra_flags: '-G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On' + extra_flags: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On' cli_cmd: '' package_cmd: 'makensis -WX -V3 ./installer/windows/installer.nsi' installer_path: './installer/windows/geode-installer-win.exe' @@ -34,7 +34,12 @@ jobs: - name: macOS os: macos-latest os_identifier: mac - extra_flags: '-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13' + extra_flags: | + -DCMAKE_C_COMPILER=clang + -DCMAKE_CXX_COMPILER=clang++ + -DCMAKE_C_COMPILER_LAUNCHER=ccache + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 cli_cmd: 'chmod +x $GITHUB_WORKSPACE/cli/geode' package_cmd: './installer/mac/package.sh ./bin/nightly ./installer/mac/geode-installer-mac.pkg' installer_path: './installer/mac/geode-installer-mac.pkg' @@ -56,11 +61,6 @@ jobs: arch: amd64_x86 if: matrix.config.os_identifier == 'win' - - name: Install ninja - shell: bash - run: choco install ninja - if: matrix.config.os_identifier == 'win' - - name: Download CLI uses: robinraju/release-downloader@v1.8 with: @@ -82,8 +82,6 @@ jobs: cmake -B ${{ github.workspace }}/build ${{ matrix.config.extra_flags }} -DCLI_PATH="${{ github.workspace }}/cli" - -DCMAKE_C_COMPILER_LAUNCHER=ccache - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - name: Build run: |