Skip to content

Commit 7c62e23

Browse files
chore: Rename default branch to main (#1156)
1 parent f8f0711 commit 7c62e23

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

.github/scripts/publish_preflight_check.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ echo_info "Generating changelog"
122122
echo_info "--------------------------------------------"
123123
echo_info ""
124124

125-
echo_info "---< git fetch origin master --prune --unshallow >---"
126-
git fetch origin master --prune --unshallow
125+
echo_info "---< git fetch origin main --prune --unshallow >---"
126+
git fetch origin main --prune --unshallow
127127
echo ""
128128

129129
echo_info "Generating changelog from history..."

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
- name: Send email on failure
5757
if: failure()
58-
uses: firebase/firebase-admin-node/.github/actions/send-email@master
58+
uses: firebase/firebase-admin-node/.github/actions/send-email@main
5959
with:
6060
api-key: ${{ secrets.OSS_BOT_MAILGUN_KEY }}
6161
domain: ${{ secrets.OSS_BOT_MAILGUN_DOMAIN }}
@@ -70,7 +70,7 @@ jobs:
7070

7171
- name: Send email on cancelled
7272
if: cancelled()
73-
uses: firebase/firebase-admin-node/.github/actions/send-email@master
73+
uses: firebase/firebase-admin-node/.github/actions/send-email@main
7474
with:
7575
api-key: ${{ secrets.OSS_BOT_MAILGUN_KEY }}
7676
domain: ${{ secrets.OSS_BOT_MAILGUN_DOMAIN }}

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ jobs:
6969

7070
# Check whether the release should be published. We publish only when the trigger PR is
7171
# 1. merged
72-
# 2. to the master branch
72+
# 2. to the main branch
7373
# 3. with the label 'release:publish', and
7474
# 4. the title prefix '[chore] Release '.
7575
if: github.event.pull_request.merged &&
76-
github.ref == 'refs/heads/master' &&
76+
github.ref == 'refs/heads/main' &&
7777
contains(github.event.pull_request.labels.*.name, 'release:publish') &&
7878
startsWith(github.event.pull_request.title, '[chore] Release ')
7979

@@ -115,7 +115,7 @@ jobs:
115115
- name: Post to Twitter
116116
if: success() &&
117117
contains(github.event.pull_request.labels.*.name, 'release:tweet')
118-
uses: firebase/firebase-admin-node/.github/actions/send-tweet@master
118+
uses: firebase/firebase-admin-node/.github/actions/send-tweet@main
119119
with:
120120
status: >
121121
${{ steps.preflight.outputs.version }} of @Firebase Admin Java SDK is available.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Great, we love hearing how we can improve our products! Share you idea through o
4747
## <a name="submit"></a>Want to submit a pull request?
4848

4949
Sweet, we'd love to accept your contribution!
50-
[Open a new pull request](https://github.com/firebase/firebase-admin-java/pull/new/master) and fill
50+
[Open a new pull request](https://github.com/firebase/firebase-admin-java/pull/new) and fill
5151
out the provided template.
5252

5353
**If you want to implement a new feature, please open an issue with a proposal first so that we can

prepare_release.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,13 @@ if [[ $(git status --porcelain) ]]; then
6666
#exit 1
6767
fi
6868

69-
echo "[INFO] Updating the master branch"
70-
git checkout master
71-
git pull origin master
69+
echo "[INFO] Updating the main branch"
70+
git fetch origin main
7271

7372
TIMESTAMP=$(date +%s)
7473
RELEASE_BRANCH="release-${TIMESTAMP}"
7574
echo "[INFO] Creating new release branch: ${RELEASE_BRANCH}"
76-
git checkout -b ${RELEASE_BRANCH} master
75+
git checkout -b ${RELEASE_BRANCH} origin/main
7776

7877

7978
#################################

0 commit comments

Comments
 (0)