diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-05 18:49:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-04-05 19:00:17 (GMT) |
| commit | 3a90800a9cc5b80f80e7139254776008cb9fa452 (patch) | |
| tree | f719b264ed6880abfa4aae93492b5bfdcdf1da6b | |
| parent | 9a1b301c8564a75bb7781dfb9241c0bf7974f882 (diff) | |
| download | CMake-3a90800a9cc5b80f80e7139254776008cb9fa452.zip CMake-3a90800a9cc5b80f80e7139254776008cb9fa452.tar.gz CMake-3a90800a9cc5b80f80e7139254776008cb9fa452.tar.bz2 | |
gitlab-ci: simplify package pipeline job conditions
Use the job stage to distinguish upload jobs instead of an
explicit variable.
| -rw-r--r-- | .gitlab/rules.yml | 6 | ||||
| -rw-r--r-- | .gitlab/upload.yml | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml index 88aa8e6..e4267d5 100644 --- a/.gitlab/rules.yml +++ b/.gitlab/rules.yml @@ -62,12 +62,12 @@ .run_only_for_package: rules: - - if: '$CMAKE_CI_PACKAGE != null && $CMAKE_CI_JOB_UPLOAD_PACKAGE == null' - when: on_success - - if: '$CMAKE_CI_PACKAGE == "dev" && $CMAKE_CI_JOB_UPLOAD_PACKAGE == "true"' + - if: '$CMAKE_CI_PACKAGE == "dev"' variables: RSYNC_DESTINATION: "dev" when: on_success + - if: '$CMAKE_CI_PACKAGE != null && $CI_JOB_STAGE != "upload"' + when: on_success - when: never .run_only_for_continuous_master: diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml index 20ec483..a4cbbde 100644 --- a/.gitlab/upload.yml +++ b/.gitlab/upload.yml @@ -19,9 +19,6 @@ - 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/ - variables: - CMAKE_CI_JOB_UPLOAD_PACKAGE: "true" - .rsync_upload_help: stage: upload image: "fedora:34" |