From 02c42a0e75d5b105e72603ec3b90f1dc626a40b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=B6ffler?= Date: Fri, 2 Oct 2020 10:23:17 +0200 Subject: [PATCH] Switch to main branch --- .gitlab-ci.yml | 8 ++++---- .gitlab-ci/deployer/servers.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6136d60..c154abc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,13 +45,13 @@ stages: except: - assets -deploy-master: +deploy-main: <<: *deploy_template environment: - name: master + name: main url: https://${PRODUCTION_HOST} only: - - master + - main deploy-develop: <<: *deploy_template @@ -64,5 +64,5 @@ deploy-develop: "Create Badge": stage: badges script: - - last_master_deploy=$(git --no-pager log -1 --date=format:"%Y/%m/%d-%T" --format="%ad" origin/master) + - last_master_deploy=$(git --no-pager log -1 --date=format:"%Y/%m/%d-%T" --format="%ad" origin/main) - anybadge -l "Last Production Deployment" -v $last_master_deploy -f lastProductionDeployment.svg -c orange diff --git a/.gitlab-ci/deployer/servers.yml b/.gitlab-ci/deployer/servers.yml index 3afe40d..7518458 100644 --- a/.gitlab-ci/deployer/servers.yml +++ b/.gitlab-ci/deployer/servers.yml @@ -1,5 +1,5 @@ -master: - stage: master +main: + stage: main hostname: typo3.org user: t3o-prod writable_mode: chmod -- GitLab