From 426e37ed765af95fb1363d36b72de3589f866e1f Mon Sep 17 00:00:00 2001
From: Lars Kruse <devel@sumpfralle.de>
Date: Sat, 19 Mar 2022 23:47:30 +0100
Subject: [PATCH] Merge with latest changes from master
ci: avoid hard-coded references to "master" branch
---
.gitlab-ci.yml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cf4eb9..8599286 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ bundle_and_test:
- public
expire_in: 2 days
only:
- - master
+ - $CI_DEFAULT_BRANCH
# test_api:
# stage: test
@@ -64,7 +64,7 @@ pages:
- public
expire_in: 2 days
only:
- - master
+ - $CI_DEFAULT_BRANCH
docker-push:
# Use the official docker image.
@@ -88,16 +88,16 @@ docker-push:
else docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
fi
- docker push "$AURA_IMAGE_NAME" --all-tags
- rules:
+ rules:
- *release-rules
# every commit on master/main branch should trigger a push to docker-hub as unstable without a release
- - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
exists:
- Dockerfile
release_job:
stage: release
- needs:
+ needs:
- docker-push
image: registry.gitlab.com/gitlab-org/release-cli:latest
rules: *release-rules
@@ -108,3 +108,4 @@ release_job:
description: ./CHANGELOG
tag_name: '$CI_COMMIT_TAG'
ref: '$CI_COMMIT_TAG'
+
--
GitLab