Skip to content

Commit d5aba84

Browse files
chore: Update default branch to main (#926)
* chore: Update default branch to main * set java version to fix emulator tools
1 parent 807e7e1 commit d5aba84

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

.github/scripts/publish_preflight_check.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ echo_info "Generating changelog"
159159
echo_info "--------------------------------------------"
160160
echo_info ""
161161

162-
echo_info "---< git fetch origin master --prune --unshallow >---"
163-
git fetch origin master --prune --unshallow
162+
echo_info "---< git fetch origin main --prune --unshallow >---"
163+
git fetch origin main --prune --unshallow
164164
echo ""
165165

166166
echo_info "Generating changelog from history..."

.github/workflows/ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ jobs:
3737
uses: actions/setup-node@v4
3838
with:
3939
node-version: 20
40+
- name: Set up Java 21
41+
uses: actions/setup-java@v5
42+
with:
43+
distribution: 'temurin'
44+
java-version: '21'
45+
check-latest: true
4046
- name: Install firebase-tools
4147
run: npm install -g firebase-tools
4248
- name: Run Database emulator tests

.github/workflows/nightly.yml

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

7171
- name: Send email on failure
7272
if: failure()
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 }}
@@ -85,7 +85,7 @@ jobs:
8585

8686
- name: Send email on cancelled
8787
if: cancelled()
88-
uses: firebase/firebase-admin-node/.github/actions/send-email@master
88+
uses: firebase/firebase-admin-node/.github/actions/send-email@main
8989
with:
9090
api-key: ${{ secrets.OSS_BOT_MAILGUN_KEY }}
9191
domain: ${{ secrets.OSS_BOT_MAILGUN_DOMAIN }}

.github/workflows/release.yml

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

8585
# Check whether the release should be published. We publish only when the trigger PR is
8686
# 1. merged
87-
# 2. to the master branch
87+
# 2. to the main branch
8888
# 3. with the label 'release:publish', and
8989
# 4. the title prefix '[chore] Release '.
9090
if: github.event.pull_request.merged &&
91-
github.ref == 'refs/heads/master' &&
91+
github.ref == 'refs/heads/main' &&
9292
contains(github.event.pull_request.labels.*.name, 'release:publish') &&
9393
startsWith(github.event.pull_request.title, '[chore] Release ')
9494

@@ -130,7 +130,7 @@ jobs:
130130
- name: Post to Twitter
131131
if: success() &&
132132
contains(github.event.pull_request.labels.*.name, 'release:tweet')
133-
uses: firebase/firebase-admin-node/.github/actions/send-tweet@master
133+
uses: firebase/firebase-admin-node/.github/actions/send-tweet@main
134134
with:
135135
status: >
136136
${{ steps.preflight.outputs.version }} of @Firebase Admin Python 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-python/pull/new/master) and fill
50+
[Open a new pull request](https://github.com/firebase/firebase-admin-python/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

0 commit comments

Comments
 (0)