diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-05-10 12:45:42 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-05-10 14:39:33 +0000 |
| commit | 78b2dad7cbc5c91a481f29155d6ae6d44d17d428 (patch) | |
| tree | 41c5f642b8b0d90bc8f0311e1040fa306b159140 | |
| parent | e71a66701ad6d86711b5396c134c9776972563e7 (diff) | |
| download | qbs-78b2dad7cbc5c91a481f29155d6ae6d44d17d428.tar.gz | |
GitHub actions: fix building debug info
This fixes building and arhiving the debug information.
We do not build debug info in release build for now to avoid including
it in the archive - it should be in a separate archive
Change-Id: I01878676190b410b3b76c9bb477dd74bf4cdd767
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | .github/workflows/main.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 2 | ||||
| -rw-r--r-- | qbs-resources/imports/QbsApp.qbs | 2 | ||||
| -rw-r--r-- | qbs-resources/imports/QbsLibrary.qbs | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 73d08027c..c4726aea1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -163,6 +163,7 @@ jobs: env: BUILD_OPTIONS: | modules.cpp.compilerWrapper:clcache + modules.qbs.debugInformation:true modules.qbsbuildconfig.enableAddressSanitizer:false modules.qbsbuildconfig.enableBundledQt:true products.qbs_archive.targetName:qbs-windows-${{ github.run_id }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9bc2776fb..2eb5fbe7f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,6 @@ jobs: name: 'Build on Linux (gcc)', options: 'qbs.installPrefix:"" modules.cpp.compilerWrapper:ccache - modules.qbs.debugInformation:true modules.qbsbuildconfig.enableAddressSanitizer:false modules.qbsbuildconfig.enableProjectFileUpdates:false modules.qbsbuildconfig.enableUnitTests:false @@ -71,7 +70,6 @@ jobs: BUILD_OPTIONS: | qbs.installPrefix:"" modules.cpp.compilerWrapper:ccache - modules.qbs.debugInformation:true modules.qbsbuildconfig.enableUnitTests:false modules.qbsbuildconfig.enableProjectFileUpdates:false modules.qbsbuildconfig.enableAddressSanitizer:false diff --git a/qbs-resources/imports/QbsApp.qbs b/qbs-resources/imports/QbsApp.qbs index 5fe32046b..2ddb3cb38 100644 --- a/qbs-resources/imports/QbsApp.qbs +++ b/qbs-resources/imports/QbsApp.qbs @@ -10,7 +10,7 @@ QbsProduct { consoleApplication: true Group { fileTagsFilter: product.type - .concat(qbs.buildVariant === "debug" ? ["debuginfo_app"] : []) + .concat(qbs.debugInformation ? ["debuginfo_app"] : []) qbs.install: true qbs.installDir: targetInstallDir qbs.installSourceBase: buildDirectory diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs index 4923d89c4..f0769dd6c 100644 --- a/qbs-resources/imports/QbsLibrary.qbs +++ b/qbs-resources/imports/QbsLibrary.qbs @@ -28,7 +28,7 @@ QbsProduct { Group { fileTagsFilter: libType.concat("dynamiclibrary_symlink") - .concat(qbs.buildVariant === "debug" ? ["debuginfo_dll"] : []) + .concat(qbs.debugInformation ? ["debuginfo_dll"] : []) qbs.install: install qbs.installDir: targetInstallDir qbs.installSourceBase: buildDirectory |