CI: Use main instead of master

This commit is contained in:
Igor Scheller 2021-03-14 12:07:34 +01:00
parent 018b1a5135
commit 5a3101012f
1 changed files with 7 additions and 7 deletions

View File

@ -188,7 +188,7 @@ release-image:
- docker tag "${TEST_IMAGE}" "${RELEASE_IMAGE}" - docker tag "${TEST_IMAGE}" "${RELEASE_IMAGE}"
- docker push "${RELEASE_IMAGE}" - docker push "${RELEASE_IMAGE}"
only: only:
- master - main
release-image-nginx: release-image-nginx:
<<: *docker_definition <<: *docker_definition
@ -202,7 +202,7 @@ release-image-nginx:
- docker tag "${TEST_IMAGE_NGINX}" "${RELEASE_IMAGE_NGINX}" - docker tag "${TEST_IMAGE_NGINX}" "${RELEASE_IMAGE_NGINX}"
- docker push "${RELEASE_IMAGE_NGINX}" - docker push "${RELEASE_IMAGE_NGINX}"
only: only:
- master - main
.deploy_template: &deploy_definition .deploy_template: &deploy_definition
stage: release stage: release
@ -247,7 +247,7 @@ pages:
paths: paths:
- public - public
only: only:
- master - main
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
@ -272,7 +272,7 @@ deploy:
environment: environment:
name: staging name: staging
only: only:
- master - main
script: script:
# Check if deployment variables where set # Check if deployment variables where set
- |- - |-
@ -382,7 +382,7 @@ deploy-production:
name: production name: production
when: manual when: manual
only: only:
- master - main
script: script:
# Check if deployment variables where set # Check if deployment variables where set
- |- - |-
@ -407,13 +407,13 @@ deploy-k8s-production:
on_stop: stop-k8s-production on_stop: stop-k8s-production
when: manual when: manual
only: only:
- master - main
stop-k8s-production: stop-k8s-production:
<<: *deploy_k8s_stop <<: *deploy_k8s_stop
needs: [ deploy-k8s-production ] needs: [ deploy-k8s-production ]
only: only:
- master - main
environment: environment:
name: production name: production
action: stop action: stop