summaryrefslogtreecommitdiffstats
path: root/.gitlab
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/rules.yml12
-rw-r--r--.gitlab/upload.yml5
2 files changed, 12 insertions, 5 deletions
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml
index 9302da4..f696c90 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
@@ -64,7 +64,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"