From 2145422239dc65287d00a31e4cc376d54bc548f2 Mon Sep 17 00:00:00 2001 From: Lahiru Maramba Date: Fri, 12 Dec 2025 22:22:22 +0000 Subject: [PATCH 1/3] Rename default branch to main --- .github/scripts/publish_preflight_check.sh | 4 ++-- .github/workflows/nightly.yml | 4 ++-- .github/workflows/release.yml | 6 +++--- CONTRIBUTING.md | 2 +- prepare_release.sh | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/scripts/publish_preflight_check.sh b/.github/scripts/publish_preflight_check.sh index 7c8e384e2..3dda8a367 100755 --- a/.github/scripts/publish_preflight_check.sh +++ b/.github/scripts/publish_preflight_check.sh @@ -122,8 +122,8 @@ echo_info "Generating changelog" echo_info "--------------------------------------------" echo_info "" -echo_info "---< git fetch origin master --prune --unshallow >---" -git fetch origin master --prune --unshallow +echo_info "---< git fetch origin main --prune --unshallow >---" +git fetch origin main --prune --unshallow echo "" echo_info "Generating changelog from history..." diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7bda5ba58..d546b57c5 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -55,7 +55,7 @@ jobs: - name: Send email on failure if: failure() - uses: firebase/firebase-admin-node/.github/actions/send-email@master + uses: firebase/firebase-admin-node/.github/actions/send-email@main with: api-key: ${{ secrets.OSS_BOT_MAILGUN_KEY }} domain: ${{ secrets.OSS_BOT_MAILGUN_DOMAIN }} @@ -70,7 +70,7 @@ jobs: - name: Send email on cancelled if: cancelled() - uses: firebase/firebase-admin-node/.github/actions/send-email@master + uses: firebase/firebase-admin-node/.github/actions/send-email@main with: api-key: ${{ secrets.OSS_BOT_MAILGUN_KEY }} domain: ${{ secrets.OSS_BOT_MAILGUN_DOMAIN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86774e50c..f8deca344 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,11 +69,11 @@ jobs: # Check whether the release should be published. We publish only when the trigger PR is # 1. merged - # 2. to the master branch + # 2. to the main branch # 3. with the label 'release:publish', and # 4. the title prefix '[chore] Release '. if: github.event.pull_request.merged && - github.ref == 'refs/heads/master' && + github.ref == 'refs/heads/main' && contains(github.event.pull_request.labels.*.name, 'release:publish') && startsWith(github.event.pull_request.title, '[chore] Release ') @@ -115,7 +115,7 @@ jobs: - name: Post to Twitter if: success() && contains(github.event.pull_request.labels.*.name, 'release:tweet') - uses: firebase/firebase-admin-node/.github/actions/send-tweet@master + uses: firebase/firebase-admin-node/.github/actions/send-tweet@main with: status: > ${{ steps.preflight.outputs.version }} of @Firebase Admin Java SDK is available. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2e6914c5f..907223c5c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -47,7 +47,7 @@ Great, we love hearing how we can improve our products! Share you idea through o ## Want to submit a pull request? Sweet, we'd love to accept your contribution! -[Open a new pull request](https://github.com/firebase/firebase-admin-java/pull/new/master) and fill +[Open a new pull request](https://github.com/firebase/firebase-admin-java/pull/new) and fill out the provided template. **If you want to implement a new feature, please open an issue with a proposal first so that we can diff --git a/prepare_release.sh b/prepare_release.sh index b531557ef..73cb6405f 100755 --- a/prepare_release.sh +++ b/prepare_release.sh @@ -66,14 +66,14 @@ if [[ $(git status --porcelain) ]]; then #exit 1 fi -echo "[INFO] Updating the master branch" -git checkout master -git pull origin master +echo "[INFO] Updating the main branch" +git checkout main +git pull origin main TIMESTAMP=$(date +%s) RELEASE_BRANCH="release-${TIMESTAMP}" echo "[INFO] Creating new release branch: ${RELEASE_BRANCH}" -git checkout -b ${RELEASE_BRANCH} master +git checkout -b ${RELEASE_BRANCH} main ################################# From 5fd4c9ddf0a49a242fadee8c1b6d2e6be0e01068 Mon Sep 17 00:00:00 2001 From: Lahiru Maramba Date: Fri, 12 Dec 2025 22:25:15 +0000 Subject: [PATCH 2/3] Trigger staging From cfc45e0bf536abba16704e4b39cbf8b59c6dd391 Mon Sep 17 00:00:00 2001 From: Lahiru Maramba Date: Fri, 12 Dec 2025 22:28:35 +0000 Subject: [PATCH 3/3] PR comments --- prepare_release.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/prepare_release.sh b/prepare_release.sh index 73cb6405f..16fc646d2 100755 --- a/prepare_release.sh +++ b/prepare_release.sh @@ -67,13 +67,12 @@ if [[ $(git status --porcelain) ]]; then fi echo "[INFO] Updating the main branch" -git checkout main -git pull origin main +git fetch origin main TIMESTAMP=$(date +%s) RELEASE_BRANCH="release-${TIMESTAMP}" echo "[INFO] Creating new release branch: ${RELEASE_BRANCH}" -git checkout -b ${RELEASE_BRANCH} main +git checkout -b ${RELEASE_BRANCH} origin/main #################################