aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorParthasarathy Tirumalai <parthasarathy.tirumalai@desy.de>2023-07-04 10:53:48 +0200
committerThomas White <thomas.white@desy.de>2023-07-04 10:53:48 +0200
commit068a02656ab2f76c3ce08ac54f7a00a8de3717a9 (patch)
tree44a582e898e35da8d0266e0c67514017d775bbc1 /.gitlab-ci.yml
parent4c2b432dacff18a748c4d5cef421e9baa12b81c1 (diff)
Update .gitlab-ci.yml file so as to merge local maxwell build and deploy...
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml30
1 files changed, 7 insertions, 23 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 445f5f06..f8030e6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -133,34 +133,18 @@ build-centos7:
when: on_success
expire_in: 1 day
-build-maxwell:
+build-deploy-local-maxwell:
tags:
- maxwell
variables:
GIT_STRATEGY: clone
script:
- - wget https://gitlab.desy.de/fs-sc/install-crystfel/-/raw/main/run-me-desy-maxwell-local
- - chmod 755 ./run-me-desy-maxwell-local
- - ./run-me-desy-maxwell-local --yes-really
- artifacts:
- paths:
- - software/
- when: on_success
- expire_in: 1 day
- rules:
- - if: $MAXWELL_DEPLOYMENT == "local"
-
-deploy-local-maxwell:
- stage: deploy
- variables:
- GIT_STRATEGY: none
- tags:
- - maxwell
- script:
- - if [ -d ~/software/crystfel/devel ]; then
- mv -f ~/software/crystfel/devel ~/software/crystfel/devel-`date +%F-%H:%M:%S`;
- fi
- - cp -rv software/crystfel/devel ~/software/crystfel/
+ - wget https://gitlab.desy.de/thomas.white/install-crystfel/-/raw/main/run-me-desy-maxwell-centos7
+ - chmod 755 ./run-me-desy-maxwell-centos7
+ - if [ -d /software/crystfel/devel ]; then
+ mv -f /software/crystfel/devel /software/crystfel/devel-`date +%F-%H:%M:%S`;
+ fi
+ - ./run-me-desy-maxwell-centos7 --yes-really
rules:
- if: $MAXWELL_DEPLOYMENT == "local" && $CI_COMMIT_BRANCH == "master"