From 596fc9fa084179d96a22e1413168c845f5fb31b3 Mon Sep 17 00:00:00 2001
From: laurentheirendt <laurent.heirendt@uni.lu>
Date: Fri, 24 Jul 2020 16:00:13 +0200
Subject: [PATCH] harmonize rules
---
.gitlab-ci.yml | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59b7c01d..f12f4233 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ prepare:index:
image: python
stage: prepare
rules:
- - if: $CI_COMMIT_BRANCH
+ - if: $CI_COMMIT_REF_NAME
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE !~ /tmpBranch/ && $CI_COMMIT_MESSAGE !~ /Update index/'
script:
- python .ci/generateIndex.py
@@ -72,7 +72,7 @@ build:pages:
paths:
- build
rules:
- - if: $CI_COMMIT_BRANCH
+ - if: $CI_COMMIT_REF_NAME
- if: $CI_MERGE_REQUEST_ID
before_script:
- apt-get -qq update
@@ -104,9 +104,6 @@ generate:searchIndex:
script:
- bash .ci/build_indices.sh
- mv build processed_build
- rules:
- - if: $CI_COMMIT_BRANCH
- - if: $CI_MERGE_REQUEST_ID
artifacts:
expire_in: 1 day
paths:
@@ -120,8 +117,7 @@ pages:
image: alpine:3.11.3
stage: deploy
rules:
- - if: '$CI_PROJECT_NAMESPACE != "R3" && $CI_PROJECT_NAMESPACE != "R3-core"'
- - if: $CI_MERGE_REQUEST_ID
+ - if: '$CI_MERGE_REQUEST_ID && $CI_PROJECT_NAMESPACE != "R3" && $CI_PROJECT_NAMESPACE != "R3-core"'
script:
- mv processed_build public
artifacts:
@@ -133,6 +129,8 @@ pages:
deploy:vm:
stage: deploy
image: alpine:3.1
+ rules:
+ - if: $CI_COMMIT_REF_NAME
before_script:
- 'which ssh-agent || ( apk add --update openssh )'
- eval $(ssh-agent -s)
@@ -142,10 +140,10 @@ deploy:vm:
- echo "$KNOWNHOSTS" > ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
rules:
- - if: '$CI_COMMIT_BRANCH == "develop" && $CI_PROJECT_PATH == "R3/howto-cards"'
- - if: '$CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "R3/howto-cards"'
+ - if: '$CI_COMMIT_REF_NAME == "develop" && $CI_PROJECT_PATH == "R3/howto-cards"'
+ - if: '$CI_COMMIT_REF_NAME == "master" && $CI_PROJECT_PATH == "R3/howto-cards"'
script:
- - ssh -p $SSHPORT $SSHCONNECT "mkdir -p ~/$CI_COMMIT_BRANCH/sources/public/$CI_JOB_ID ~/$CI_COMMIT_BRANCH/public"
- - scp -P $SSHPORT -r processed_build/* $SSHCONNECT:~/$CI_COMMIT_BRANCH/sources/public/$CI_JOB_ID
- - ssh -p $SSHPORT $SSHCONNECT "cd ~/$CI_COMMIT_BRANCH/public && ln -fs ../sources/public/$CI_JOB_ID/* . && cd ~/$CI_COMMIT_BRANCH/sources/public/ && find . -type d -not -newermt '-1 minutes' -exec rm -rf {} +;"
+ - ssh -p $SSHPORT $SSHCONNECT "mkdir -p ~/$CI_COMMIT_REF_NAME/sources/public/$CI_JOB_ID ~/$CI_COMMIT_REF_NAME/public"
+ - scp -P $SSHPORT -r processed_build/* $SSHCONNECT:~/$CI_COMMIT_REF_NAME/sources/public/$CI_JOB_ID
+ - ssh -p $SSHPORT $SSHCONNECT "cd ~/$CI_COMMIT_REF_NAME/public && ln -fs ../sources/public/$CI_JOB_ID/* . && cd ~/$CI_COMMIT_REF_NAME/sources/public/ && find . -type d -not -newermt '-1 minutes' -exec rm -rf {} +;"
--
GitLab