From afeafd85f1af089ace2a35cce855946362f055c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20Lopez=20de=20Guere=C3=B1a?=
<jon.lopezdeguerena@tecnalia.com>
Date: Mon, 7 Jun 2021 14:49:55 +0200
Subject: [PATCH] only and except re added
---
project-maven-azure-docker/build.yml | 4 +++-
project-maven-azure-docker/release.yml | 12 ++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/project-maven-azure-docker/build.yml b/project-maven-azure-docker/build.yml
index b28faee..15116f8 100644
--- a/project-maven-azure-docker/build.yml
+++ b/project-maven-azure-docker/build.yml
@@ -10,7 +10,9 @@ build:
- docker login -u $ACR_USERNAME -p $ACR_PASSWORD $ACR_URL
- docker image build --build-arg REG=https://artifact.tecnalia.com/artifactory/api/npm/digicon-npm-dev/ --build-arg NPM_TKN=$NPM_TOKEN --build-arg US=$ACR_USERNAME --build-arg CI_TOKEN=$ACR_PASSWORD -t $CONTAINER_IMAGE ./
- docker push $CONTAINER_IMAGE
- rules:
+ except:
+ - branches
+ # rules:
- if: '$CI_COMMIT_REF_NAME == "master"'
when: always
- when: never
\ No newline at end of file
diff --git a/project-maven-azure-docker/release.yml b/project-maven-azure-docker/release.yml
index 486ba77..1348df3 100644
--- a/project-maven-azure-docker/release.yml
+++ b/project-maven-azure-docker/release.yml
@@ -8,7 +8,11 @@ release:
--milestone $CI_COMMIT_TAG
- export COMMIT_TIME=$(git show -s --format=%ct $CI_COMMIT_SHA)
--released-at $COMMIT_TIME
- rules:
- - if: $CI_COMMIT_BRANCH == "master" && ('$CI_COMMIT_TAG == /^v\d+.\d+.\d|\d+.\d+/')
- when: always
- - when: never
\ No newline at end of file
+ except:
+ - branches
+ only:
+ - tags
+ # rules:
+ # - if: $CI_COMMIT_BRANCH == "master" && ('$CI_COMMIT_TAG == /^v\d+.\d+.\d|\d+.\d+/')
+ # when: always
+ # - when: never
\ No newline at end of file
--
GitLab