From 407dd8d4022e73c12af3712e4b40b44a5bdce8b6 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 12:29:47 +0200
Subject: [PATCH] test
---
project-maven-azure-docker/build.yml | 4 +---
project-maven-azure-docker/release.yml | 6 +-----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/project-maven-azure-docker/build.yml b/project-maven-azure-docker/build.yml
index 060a708..2ad6ce3 100644
--- a/project-maven-azure-docker/build.yml
+++ b/project-maven-azure-docker/build.yml
@@ -11,6 +11,4 @@ build:
- 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:
- - if: '$CI_COMMIT_REF_NAME =~ "master"'
- when: never
- - when: on_success
\ No newline at end of file
+ - if: '$CI_COMMIT_REF_NAME =~ "master"'
\ No newline at end of file
diff --git a/project-maven-azure-docker/release.yml b/project-maven-azure-docker/release.yml
index 7bd6d9d..b3b254f 100644
--- a/project-maven-azure-docker/release.yml
+++ b/project-maven-azure-docker/release.yml
@@ -9,8 +9,4 @@ release:
- export COMMIT_TIME=$(git show -s --format=%ct $CI_COMMIT_SHA)
--released-at $COMMIT_TIME
rules:
- - if: ('$CI_COMMIT_TAG =~ /^v\d+.\d+.\d|\d+.\d+/')
- when: never
- - if: '$CI_COMMIT_REF_NAME =~ "master"'
- when: never
- - when: on_success
\ No newline at end of file
+ - if: $CI_COMMIT_BRANCH == "master" && ('$CI_COMMIT_TAG == /^v\d+.\d+.\d|\d+.\d+/')
\ No newline at end of file
--
GitLab