diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-04 17:26:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-04-04 17:26:19 (GMT) |
| commit | b20a19fca172508f6f3a13b0ab2823a89355e639 (patch) | |
| tree | 106fad6d7c6f232446bbfeea7b0e9d82954e41fc /.gitlab | |
| parent | 7260208379738bf4052e44d32588152b475e98da (diff) | |
| parent | cb44e0d47c2ea63f60688a254f6018a8c435a554 (diff) | |
| download | CMake-b20a19fca172508f6f3a13b0ab2823a89355e639.zip CMake-b20a19fca172508f6f3a13b0ab2823a89355e639.tar.gz CMake-b20a19fca172508f6f3a13b0ab2823a89355e639.tar.bz2 | |
Merge branch 'backport-3.22-ci-package-uploads' into ci-package-uploads
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/rules.yml | 12 | ||||
| -rw-r--r-- | .gitlab/upload.yml | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml index a871b8f..88aa8e6 100644 --- a/.gitlab/rules.yml +++ b/.gitlab/rules.yml @@ -2,7 +2,7 @@ .run_manually: rules: - - if: '$CMAKE_CI_PACKAGE == "true"' + - if: '$CMAKE_CI_PACKAGE != null' when: never - if: '$CMAKE_CI_NIGHTLY == "true"' when: on_success @@ -23,7 +23,7 @@ .run_automatically: rules: - - if: '$CMAKE_CI_PACKAGE == "true"' + - if: '$CMAKE_CI_PACKAGE != null' when: never - if: '$CMAKE_CI_NIGHTLY == "true"' when: on_success @@ -44,7 +44,7 @@ .run_dependent: rules: - - if: '$CMAKE_CI_PACKAGE == "true"' + - if: '$CMAKE_CI_PACKAGE != null' when: never - if: '($CMAKE_CI_NIGHTLY == "true" && $CMAKE_CI_NIGHTLY_IGNORE_DEPS == "true")' when: always @@ -62,7 +62,11 @@ .run_only_for_package: rules: - - if: '$CMAKE_CI_PACKAGE == "true"' + - 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"' + variables: + RSYNC_DESTINATION: "dev" when: on_success - when: never diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml index dc7da7e..a1d86a6 100644 --- a/.gitlab/upload.yml +++ b/.gitlab/upload.yml @@ -1,6 +1,6 @@ # Steps for uploading artifacts -.rsync_upload_binary: +.rsync_upload_package: image: "fedora:35" stage: upload tags: @@ -18,6 +18,9 @@ - ssh-keygen -y -f $RSYNC_BINARY_KEY > $RSYNC_BINARY_KEY.pub - 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:35" |