Skip to content
Snippets Groups Projects
Commit 426e37ed authored by Lars Kruse's avatar Lars Kruse Committed by David Trattnig
Browse files

Merge with latest changes from master

ci: avoid hard-coded references to "master" branch
parent e7e6b233
No related branches found
No related tags found
1 merge request!1Style & Tests
...@@ -40,7 +40,7 @@ bundle_and_test: ...@@ -40,7 +40,7 @@ bundle_and_test:
- public - public
expire_in: 2 days expire_in: 2 days
only: only:
- master - $CI_DEFAULT_BRANCH
# test_api: # test_api:
# stage: test # stage: test
...@@ -64,7 +64,7 @@ pages: ...@@ -64,7 +64,7 @@ pages:
- public - public
expire_in: 2 days expire_in: 2 days
only: only:
- master - $CI_DEFAULT_BRANCH
docker-push: docker-push:
# Use the official docker image. # Use the official docker image.
...@@ -88,16 +88,16 @@ docker-push: ...@@ -88,16 +88,16 @@ docker-push:
else docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG . else docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
fi fi
- docker push "$AURA_IMAGE_NAME" --all-tags - docker push "$AURA_IMAGE_NAME" --all-tags
rules: rules:
- *release-rules - *release-rules
# every commit on master/main branch should trigger a push to docker-hub as unstable without a release # 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: exists:
- Dockerfile - Dockerfile
release_job: release_job:
stage: release stage: release
needs: needs:
- docker-push - docker-push
image: registry.gitlab.com/gitlab-org/release-cli:latest image: registry.gitlab.com/gitlab-org/release-cli:latest
rules: *release-rules rules: *release-rules
...@@ -108,3 +108,4 @@ release_job: ...@@ -108,3 +108,4 @@ release_job:
description: ./CHANGELOG description: ./CHANGELOG
tag_name: '$CI_COMMIT_TAG' tag_name: '$CI_COMMIT_TAG'
ref: '$CI_COMMIT_TAG' ref: '$CI_COMMIT_TAG'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment