summaryrefslogtreecommitdiffstats
path: root/.gitlab/rules.yml
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-02-28 14:33:45 (GMT)
committerBrad King <brad.king@kitware.com>2023-02-28 18:39:44 (GMT)
commit0929221ca3641ed890b15fc9abd416a5311138cf (patch)
treee2e993f3238516f69888fcbee72edede8da5753c /.gitlab/rules.yml
parentce2e8253069fa1e5750b800a19f85c6e3b359bd8 (diff)
downloadCMake-0929221ca3641ed890b15fc9abd416a5311138cf.zip
CMake-0929221ca3641ed890b15fc9abd416a5311138cf.tar.gz
CMake-0929221ca3641ed890b15fc9abd416a5311138cf.tar.bz2
gitlab-ci: Simplify Windows packaging pipeline
In commit 4c7c66dcf5 (gitlab-ci: Add jobs to make Windows x86_64 and i386 packages, 2022-05-19, v3.24.0-rc1~112^2) we used a separate Windows packaging job in nightly packaging pipelines. It did not run in release pipelines, where we need to run the final packaging step manually with signing. Simplify nightly packaging pipelines by running `cpack` at the end of the build job as we do for other platforms. For release packaging pipelines, create an archive of the files needed to build a package, and present this as the built "package" on Windows.
Diffstat (limited to '.gitlab/rules.yml')
-rw-r--r--.gitlab/rules.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml
index 8fc40a7f..8efa304 100644
--- a/.gitlab/rules.yml
+++ b/.gitlab/rules.yml
@@ -70,7 +70,7 @@
when: on_success
- if: '$CMAKE_CI_PACKAGE != null && $CI_JOB_STAGE == "prep"'
when: manual
- - if: '$CMAKE_CI_PACKAGE != null && $CI_JOB_STAGE != "package" && $CI_JOB_STAGE != "upload"'
+ - if: '$CMAKE_CI_PACKAGE != null && $CI_JOB_STAGE != "upload"'
when: on_success
- when: never