Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
engine-api
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AURA
engine-api
Commits
426e37ed
Commit
426e37ed
authored
3 years ago
by
Lars Kruse
Committed by
David Trattnig
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
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
!1
Style & Tests
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab-ci.yml
+6
-5
6 additions, 5 deletions
.gitlab-ci.yml
with
6 additions
and
5 deletions
.gitlab-ci.yml
+
6
−
5
View file @
426e37ed
...
@@ -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'
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment