From 27b653c2b83c8df843617a5aaffdd86da9dd20cd Mon Sep 17 00:00:00 2001 From: gera Date: Mon, 23 Jan 2023 15:06:10 +0100 Subject: [PATCH 1/3] chore: undo dev-tag image build --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e73e516a1..391863b1f8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,6 @@ build: - develop - master - /^[0-9]+(?:\.[0-9]+){2}(?:-(rc)*([0-9])+)?$/ - - /^[dev-](\w*-)*[0-9]?$/ variables: DOCKER_HUB_PARACHAIN: "kiltprotocol/kilt-node" DOCKER_HUB_STANDALONE: "kiltprotocol/mashnet-node" From efa8114fc333ba0c20b0a789bf897fd935ededfa Mon Sep 17 00:00:00 2001 From: gera Date: Mon, 23 Jan 2023 16:35:39 +0100 Subject: [PATCH 2/3] fix: tag latest only on semantic release --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc03084887..176593aee1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,6 +48,7 @@ build: - develop - master - /^[0-9]+(?:\.[0-9]+){2}(?:-(rc)*([0-9])+)?$/ + - /^[dev-](\w*-)*[0-9]?$/ variables: DOCKER_HUB_PARACHAIN: "kiltprotocol/kilt-node" DOCKER_HUB_STANDALONE: "kiltprotocol/mashnet-node" @@ -63,7 +64,7 @@ build: - "if [[ ! -z ${CI_COMMIT_BRANCH} ]]; then ./.maintain/push-image.sh build ${CI_COMMIT_SHORT_SHA}; fi" - "if [[ ! -z ${CI_COMMIT_BRANCH} ]]; then ./.maintain/push-image.sh build latest-${CI_COMMIT_BRANCH}; fi" - "if [[ ! -z ${CI_COMMIT_TAG} ]]; then ./.maintain/push-image.sh build ${CI_COMMIT_TAG}; fi" - - "if [[ ! -z ${CI_COMMIT_TAG} && ! -z ${CI_COMMIT_TAG##*-rc*} ]]; then ./.maintain/push-image.sh build latest; fi" + - "if [[ ${CI_COMMIT_TAG} =~ ^[0-9]+(\.[0-9]+)*$ ]]; then ./.maintain/push-image.sh build latest; fi" build-wasm-peregrine: image: From 296260e6178c00f6ab5ae9805195d4c9f9d998ec Mon Sep 17 00:00:00 2001 From: gera Date: Mon, 23 Jan 2023 17:39:59 +0100 Subject: [PATCH 3/3] fix: fromatting --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 176593aee1..f3cd90ee13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,7 +64,7 @@ build: - "if [[ ! -z ${CI_COMMIT_BRANCH} ]]; then ./.maintain/push-image.sh build ${CI_COMMIT_SHORT_SHA}; fi" - "if [[ ! -z ${CI_COMMIT_BRANCH} ]]; then ./.maintain/push-image.sh build latest-${CI_COMMIT_BRANCH}; fi" - "if [[ ! -z ${CI_COMMIT_TAG} ]]; then ./.maintain/push-image.sh build ${CI_COMMIT_TAG}; fi" - - "if [[ ${CI_COMMIT_TAG} =~ ^[0-9]+(\.[0-9]+)*$ ]]; then ./.maintain/push-image.sh build latest; fi" + - "if [[ ! -z ${CI_COMMIT_TAG} && ! -z ${CI_COMMIT_TAG##*-rc*} && ! -z ${CI_COMMIT_TAG##*dev-*} ]]; then ./.maintain/push-image.sh build latest; fi" build-wasm-peregrine: image: