diff options
| author | Patric Stout <truebrain@openttd.org> | 2020-12-26 13:48:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-26 13:48:57 +0100 |
| commit | f2d78b11ddc50cea53a8c84e3584319ba5dd0e7b (patch) | |
| tree | 5df6cbe1249d01a04e423808e65e0c5f0b5fda26 /.github | |
| parent | 6aef1164a4c34d17b60acfb99e61117f35749c98 (diff) | |
| download | openttd-f2d78b11ddc50cea53a8c84e3584319ba5dd0e7b.tar.xz | |
Fix: [Actions] cmakeBuildType is only used with CMakeListsTxtBasic (#8435)
We use CMakeListsTxtAdvanced, and as such, we have to do this our
self via "-DCMAKE_BUILD_TYPE=RelWithDebInfo". Otherwise we are
producing Debug builds instead of Release builds. Oops.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/release.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 965fe1bf6..275a994d9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -479,8 +479,7 @@ jobs: useVcpkgToolchainFile: false buildDirectory: '${{ github.workspace }}/build-host' buildWithCMakeArgs: '--target tools' - cmakeBuildType: RelWithDebInfo - cmakeAppendedArgs: ' -GNinja -DOPTION_TOOLS_ONLY=ON' + cmakeAppendedArgs: ' -GNinja -DOPTION_TOOLS_ONLY=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo' - name: Install MSVC problem matcher uses: ammaraskar/msvc-problem-matcher@master @@ -492,8 +491,7 @@ jobs: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced useVcpkgToolchainFile: true buildDirectory: '${{ github.workspace }}/build' - cmakeBuildType: RelWithDebInfo - cmakeAppendedArgs: ' -GNinja -DOPTION_USE_NSIS=ON -DHOST_BINARY_DIR=${{ github.workspace }}/build-host' + cmakeAppendedArgs: ' -GNinja -DOPTION_USE_NSIS=ON -DHOST_BINARY_DIR=${{ github.workspace }}/build-host -DCMAKE_BUILD_TYPE=RelWithDebInfo' - name: Build (without installer) if: needs.source.outputs.is_tag != 'true' || matrix.arch == 'arm64' @@ -502,8 +500,7 @@ jobs: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced useVcpkgToolchainFile: true buildDirectory: '${{ github.workspace }}/build' - cmakeBuildType: RelWithDebInfo - cmakeAppendedArgs: ' -GNinja -DHOST_BINARY_DIR=${{ github.workspace }}/build-host' + cmakeAppendedArgs: ' -GNinja -DHOST_BINARY_DIR=${{ github.workspace }}/build-host -DCMAKE_BUILD_TYPE=RelWithDebInfo' - name: Create bundles shell: bash |