diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-02-19 10:57:25 +0100 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-02-19 10:57:25 +0100 |
| commit | 36f139c4f405e057baa768e4728704b22de6519d (patch) | |
| tree | 4b554ff21e92698c185d0683b50c7cd742c18817 /.github | |
| parent | 2bc823ec00cec8a1d58981710eb50ba85b4f58d7 (diff) | |
| parent | 7b50dca83a5a75a5c24b5ef329f25990daf2ff50 (diff) | |
Merge branch '1.18'
Change-Id: I4e437865514add88558f66420718bc02fb39e41d
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/main.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 58bc08d54..3f6b3ed6a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -257,6 +257,13 @@ jobs: profile: '', script: './scripts/test-qt-for-android.sh', } + - { + name: 'Run Linux tests (Qt 4.8.7)', + image: 'focal-qt4', + profile: '', + script: './scripts/test-qt4.sh', + } + env: QBS_TEST_SOURCE_ROOT: 'tests' QBS_AUTOTEST_PROFILE: ${{ matrix.config.profile }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8cb447447..f807e9117 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,9 +18,11 @@ jobs: config: - { name: 'Build on Linux (gcc)', - options: 'modules.cpp.compilerWrapper:ccache + options: 'qbs.installPrefix:"" + modules.cpp.compilerWrapper:ccache modules.qbs.debugInformation:true modules.qbsbuildconfig.enableAddressSanitizer:false + modules.qbsbuildconfig.enableProjectFileUpdates:false modules.qbsbuildconfig.enableUnitTests:false modules.qbsbuildconfig.enableBundledQt:true', script: './scripts/build-qbs-with-qbs.sh', @@ -67,9 +69,11 @@ jobs: timeout-minutes: 60 env: BUILD_OPTIONS: | + qbs.installPrefix:"" modules.cpp.compilerWrapper:ccache modules.qbs.debugInformation:true modules.qbsbuildconfig.enableUnitTests:false + modules.qbsbuildconfig.enableProjectFileUpdates:false modules.qbsbuildconfig.enableAddressSanitizer:false modules.qbsbuildconfig.enableBundledQt:true WITH_TESTS: 0 @@ -154,7 +158,7 @@ jobs: qbs.buildVariant:release modules.cpp.compilerWrapper:clcache modules.qbsbuildconfig.enableBundledQt:true - modules.qbsbuildconfig.enableProjectFileUpdates:true + modules.qbsbuildconfig.enableProjectFileUpdates:false modules.qbsbuildconfig.enableUnitTests:false modules.cpp.treatWarningsAsErrors:true project.withDocumentation:true |