diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-05 19:39:07 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-04-05 15:39:13 -0400 |
| commit | 4bf579b8cb0f87db9e1b3b9fa1da46fde4a0068f (patch) | |
| tree | fb238093dc7636b6b13242d35df83a109f1654ce /.gitlab | |
| parent | e2eae982c6671c4993990a2fa3c4763825073325 (diff) | |
| parent | eb410615f232647912687bedb0239d0912273bac (diff) | |
| download | cmake-4bf579b8cb0f87db9e1b3b9fa1da46fde4a0068f.tar.gz | |
Merge topic 'ci-release-manual' into release-3.23
eb410615f2 gitlab-ci: start release package pipelines manually
3a90800a9c gitlab-ci: simplify package pipeline job conditions
9a1b301c85 gitlab-ci: add sanity check to upload jobs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7143
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/rules.yml | 8 | ||||
| -rw-r--r-- | .gitlab/upload.yml | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml index 88aa8e6f94..5642c1595c 100644 --- a/.gitlab/rules.yml +++ b/.gitlab/rules.yml @@ -62,12 +62,14 @@ .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 == "prep"' + when: manual + - 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 a1d86a6736..d831c3e55c 100644 --- a/.gitlab/upload.yml +++ b/.gitlab/upload.yml @@ -16,11 +16,9 @@ - dnf install -y --setopt=install_weak_deps=False rsync openssh-clients - chmod 400 $RSYNC_BINARY_KEY - ssh-keygen -y -f $RSYNC_BINARY_KEY > $RSYNC_BINARY_KEY.pub + - 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:35" @@ -37,4 +35,5 @@ - dnf install -y --setopt=install_weak_deps=False rsync openssh-clients - chmod 400 $RSYNC_HELP_KEY - ssh-keygen -y -f $RSYNC_HELP_KEY > $RSYNC_HELP_KEY.pub + - test -n "$RSYNC_DESTINATION" - rsync -tv --recursive --delete -e "ssh -i $RSYNC_HELP_KEY -o StrictHostKeyChecking=no -o LogLevel=ERROR" build/html/ kitware@cmake.org:$RSYNC_DESTINATION/ |