From 458dc53884be9f2e53618a35529a1ed4febda56e Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sun, 6 Mar 2022 14:22:18 -0500 Subject: [PATCH] chore: rename default branch to main --- .github/workflows/lint.yml | 2 +- .github/workflows/sync_translations.yml | 4 ++-- .github/workflows/tests_emulator.yml | 2 +- .github/workflows/tests_unit.yml | 2 +- AnkiDroid/src/main/assets/changelog.html | 2 +- README.md | 8 ++++---- api/build.gradle | 4 ++-- tools/pull-compile-push.sh | 2 +- tools/quality-check/codacy-ankidroid.sh | 4 ++-- tools/release.sh | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e0383acae7..b8631d4e7b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,7 @@ on: - 'gradle/**' push: branches: - - master + - main - i18n_sync - dependency-updates - 'release**' diff --git a/.github/workflows/sync_translations.yml b/.github/workflows/sync_translations.yml index 696cc89c29..e926880d6b 100644 --- a/.github/workflows/sync_translations.yml +++ b/.github/workflows/sync_translations.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - ref: 'master' + ref: 'main' fetch-depth: 0 - name: Credential Prep @@ -29,7 +29,7 @@ jobs: git config --global user.name 'AnkiDroid Translations' git config --global user.email 'ankidroid@ankidroid.org' git checkout -b i18n_sync - git reset --hard origin/master + git reset --hard origin/main shell: bash - name: Credential Prep diff --git a/.github/workflows/tests_emulator.yml b/.github/workflows/tests_emulator.yml index fb77cb8b6d..066442ac74 100644 --- a/.github/workflows/tests_emulator.yml +++ b/.github/workflows/tests_emulator.yml @@ -15,7 +15,7 @@ on: - 'gradle/**' push: branches: - - master + - main - i18n_sync - dependency-updates - 'release**' diff --git a/.github/workflows/tests_unit.yml b/.github/workflows/tests_unit.yml index 4cf42e7926..5c5123c727 100644 --- a/.github/workflows/tests_unit.yml +++ b/.github/workflows/tests_unit.yml @@ -15,7 +15,7 @@ on: - 'gradle/**' push: branches: - - master + - main - i18n_sync - dependency-updates - 'release**' diff --git a/AnkiDroid/src/main/assets/changelog.html b/AnkiDroid/src/main/assets/changelog.html index 48be2162e2..98693cb296 100644 --- a/AnkiDroid/src/main/assets/changelog.html +++ b/AnkiDroid/src/main/assets/changelog.html @@ -5,6 +5,6 @@ The changelog is not updated for development versions.

The current stable changelog is here. - The list of commits to the development version is visible here. + The list of commits to the development version is visible here. diff --git a/README.md b/README.md index 67373877e1..d12cd6bc63 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

release -build +build Open Collective backers and sponsors commit-activity forks @@ -11,7 +11,7 @@ contributors -license +license

# AnkiDroid @@ -134,5 +134,5 @@ Our Awesome Team of Contributors License ------- -[GPL-3.0 License](https://github.com/ankidroid/Anki-Android/blob/master/COPYING) -[AGPL-3.0 Licence](https://github.com/ankitects/anki/blob/master/LICENSE) for some part of the back-end +[GPL-3.0 License](https://github.com/ankidroid/Anki-Android/blob/main/COPYING) +[AGPL-3.0 Licence](https://github.com/ankitects/anki/blob/main/LICENSE) for some part of the back-end diff --git a/api/build.gradle b/api/build.gradle index bc7dbfd9ac..8dc0688e44 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -103,11 +103,11 @@ publishing { pom { name = 'AnkiDroid API' description = 'A programmatic API exported by AnkiDroid' - url = 'https://github.com/ankidroid/Anki-Android/tree/master/api' + url = 'https://github.com/ankidroid/Anki-Android/tree/main/api' licenses { license { name = 'GNU LESSER GENERAL PUBLIC LICENSE, v3' - url = 'https://github.com/ankidroid/Anki-Android/blob/master/api/COPYING.LESSER' + url = 'https://github.com/ankidroid/Anki-Android/blob/main/api/COPYING.LESSER' } } scm { diff --git a/tools/pull-compile-push.sh b/tools/pull-compile-push.sh index 01282214eb..f526dd8a36 100755 --- a/tools/pull-compile-push.sh +++ b/tools/pull-compile-push.sh @@ -16,7 +16,7 @@ DEFAULT_DEVELOPER="nobnago" DEVELOPER=${1:-$DEFAULT_DEVELOPER} # Branch selection -DEFAULT_BRANCH="master" +DEFAULT_BRANCH="main" BRANCH=${2:-$DEFAULT_BRANCH} # Change to the AnkiDroid project directory diff --git a/tools/quality-check/codacy-ankidroid.sh b/tools/quality-check/codacy-ankidroid.sh index f0484c991e..f016e2a48a 100755 --- a/tools/quality-check/codacy-ankidroid.sh +++ b/tools/quality-check/codacy-ankidroid.sh @@ -5,8 +5,8 @@ # You need to install Docker first # You need to install 'codacy-analysis-cli' second # -# You should run this against master frequently to generate a base for comparison -# Then pre-checkin you run this against your branch and diff your branch vs master +# You should run this against main frequently to generate a base for comparison +# Then pre-checkin you run this against your branch and diff your branch vs main SOURCE_BASE=/home/$USER/work/AnkiDroid SOURCE=$SOURCE_BASE/Anki-Android diff --git a/tools/release.sh b/tools/release.sh index 22328891ca..d45f91c220 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -10,7 +10,7 @@ # Basic expectations # - tools needed: sed, gawk, github-release, git -# - authority needed: ability to commit/tag/push directly to master in AnkiDroid, ability to create releases +# - authority needed: ability to commit/tag/push directly to main branch in AnkiDroid, ability to create releases # - ankidroiddocs checked out in a sibling directory (that is, '../ankidroiddocs' should exist with 'upstream' remote set correctly) # Suffix configuration