From a18a12d6b8de544dded9ced340050cc35a365d11 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Mon, 22 Feb 2021 11:13:01 +0100
Subject: [PATCH] Change default branch name
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4905711cd..82201fa38 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ build:
paths:
- "*.apk"
rules:
- - if: "$CI_COMMIT_BRANCH == 'master'"
+ - if: "$CI_COMMIT_BRANCH == 'main'"
when: on_success
test:
@@ -42,7 +42,7 @@ test:
- "*/build/test-results/**/TEST-*.xml"
- "*/build/reports/*.xml"
rules:
- - if: "$CI_COMMIT_BRANCH == 'master'"
+ - if: "$CI_COMMIT_BRANCH == 'main'"
when: on_success
deploy-local:
@@ -57,7 +57,7 @@ deploy-local:
- "s3cmd put $VERSION s3://releases/quasseldroid-ng/$VERSION"
- "s3cmd cp s3://releases/quasseldroid-ng/$VERSION s3://releases/quasseldroid-ng/Quasseldroid-latest.apk"
rules:
- - if: "$CI_COMMIT_BRANCH == 'master' && $S3_CONFIG != ''"
+ - if: "$CI_COMMIT_BRANCH == 'main' && $S3_CONFIG != ''"
when: on_success
deploy-beta:
@@ -71,5 +71,5 @@ deploy-beta:
- "export VERSION=$(ls *.apk)"
- "fastlane supply --apk $VERSION --track beta --json_key $HOME/key.json --package_name com.iskrembilen.quasseldroid --skip_upload_metadata=true --skip_upload_images=true --skip_upload_screenshots=true"
rules:
- - if: "$CI_COMMIT_BRANCH == 'master' && $FASTLANE_CONFIG != ''"
+ - if: "$CI_COMMIT_BRANCH == 'main' && $FASTLANE_CONFIG != ''"
when: on_success
--
GitLab