Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/scripts/publish_preflight_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ')

Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Great, we love hearing how we can improve our products! Share you idea through o
## <a name="submit"></a>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
Expand Down
8 changes: 4 additions & 4 deletions prepare_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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


#################################
Expand Down