Skip to content

Commit 59cc9ce

Browse files
authored
Split staging release script into 2 parts (#6339)
1 parent d6338f0 commit 59cc9ce

File tree

3 files changed

+43
-19
lines changed

3 files changed

+43
-19
lines changed

.github/workflows/release-log.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
branches:
66
- release
7-
- v8-releasebranch
7+
- '*-releasebranch'
88

99
jobs:
1010
release:

.github/workflows/release-pr.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Create Release PR
2+
3+
on:
4+
push:
5+
branches:
6+
- release
7+
- '*-releasebranch'
8+
9+
jobs:
10+
release:
11+
name: Create Release PR
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout Repo
15+
uses: actions/checkout@master
16+
with:
17+
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
18+
fetch-depth: 0
19+
20+
- name: Setup Node.js 14.x
21+
uses: actions/setup-node@master
22+
with:
23+
node-version: 14.x
24+
25+
- name: Install Dependencies
26+
run: yarn
27+
28+
# Ensures a new @firebase/app is published with every release.
29+
# This keeps the SDK_VERSION variable up to date.
30+
- name: Add a changeset for @firebase/app
31+
# pull master so changeset can diff against it
32+
run: |
33+
git pull -f --no-rebase origin master:master
34+
yarn ts-node-script scripts/ci/add_changeset.ts
35+
36+
- name: Create Release Pull Request
37+
uses: changesets/action@v1
38+
env:
39+
GITHUB_TOKEN: ${{ secrets.OSS_BOT_GITHUB_TOKEN }}

.github/workflows/release-staging.yml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,35 +30,20 @@ jobs:
3030
with:
3131
github-token: ${{ secrets.GITHUB_TOKEN }}
3232
script: |
33+
let branch = context.ref.replace("refs/heads/", "")
3334
await github.rest.repos.merge({
3435
owner: context.repo.owner,
3536
repo: context.repo.repo,
36-
base: 'release',
37+
base: branch,
3738
head: 'master'
3839
})
39-
- name: Checkout release branch (with history)
40+
- name: Checkout current branch (with history)
4041
uses: actions/checkout@master
4142
with:
4243
# Release script requires git history and tags.
4344
fetch-depth: 0
44-
ref: release
4545
- name: Yarn install
4646
run: yarn
47-
# Ensures a new @firebase/app is published with every release.
48-
# This keeps the SDK_VERSION variable up to date.
49-
- name: Add a changeset for @firebase/app
50-
# pull master so changeset can diff against it
51-
run: |
52-
git pull -f --no-rebase origin master:master
53-
yarn ts-node-script scripts/ci/add_changeset.ts
54-
- name: Create Release Pull Request
55-
uses: changesets/action@v1
56-
env:
57-
GITHUB_TOKEN: ${{ secrets.OSS_BOT_GITHUB_TOKEN }}
58-
- name: Go back to release branch
59-
# changesets/action created and checked out a new branch
60-
# return to `release` branch.
61-
run: git checkout release
6247
- name: Publish to NPM
6348
# --skipTests No need to run tests
6449
# --skipReinstall Yarn install has already been run

0 commit comments

Comments
 (0)