mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-26 16:39:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

gitlab-ci: simplify package pipeline job conditions

Browse Source 
Use the job stage to distinguish upload jobs instead of an
explicit variable.
This commit is contained in:
Brad King
2022-04-05 14:49:27 -04:00
parent 9a1b301c85
commit 3a90800a9c
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab/rules.yml
View File

@@ -62,12 +62,12 @@
.run_only_for_package: .run_only_for_package:
rules: rules:
- if: '$CMAKE_CI_PACKAGE != null && $CMAKE_CI_JOB_UPLOAD_PACKAGE == null' - if: '$CMAKE_CI_PACKAGE == "dev"'
when: on_success
- if: '$CMAKE_CI_PACKAGE == "dev" && $CMAKE_CI_JOB_UPLOAD_PACKAGE == "true"'
variables: variables:
RSYNC_DESTINATION: "dev" RSYNC_DESTINATION: "dev"
when: on_success when: on_success
- if: '$CMAKE_CI_PACKAGE != null && $CI_JOB_STAGE != "upload"'
when: on_success
- when: never - when: never
.run_only_for_continuous_master: .run_only_for_continuous_master:

3
.gitlab/upload.yml
View File

@@ -19,9 +19,6 @@
- test -n "$RSYNC_DESTINATION" - test -n "$RSYNC_DESTINATION"
- rsync -tv --recursive -e "ssh -i $RSYNC_BINARY_KEY -o StrictHostKeyChecking=no -o LogLevel=ERROR" build/ kitware@cmake.org:$RSYNC_DESTINATION/ - rsync -tv --recursive -e "ssh -i $RSYNC_BINARY_KEY -o StrictHostKeyChecking=no -o LogLevel=ERROR" build/ kitware@cmake.org:$RSYNC_DESTINATION/
variables:
CMAKE_CI_JOB_UPLOAD_PACKAGE: "true"
.rsync_upload_help: .rsync_upload_help:
stage: upload stage: upload
image: "fedora:34" image: "fedora:34"