Skip to content

Commit 2ad6ce8

Browse files
authored
Fix changeset checker to stop using since option (#5555)
1 parent addd8b1 commit 2ad6ce8

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.github/workflows/check-changeset.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ jobs:
2424
- name: Yarn install
2525
run: yarn
2626
- name: Run changeset script
27-
run: yarn ts-node-script scripts/ci/check_changeset.ts
27+
# pull master so changeset can diff against it
28+
run: |
29+
git pull -f --no-rebase origin master:master
30+
yarn ts-node-script scripts/ci/check_changeset.ts
2831
id: check-changeset
2932
- name: Print changeset checker output
3033
run: echo "${{steps.check-changeset.outputs.CHANGESET_ERROR_MESSAGE}}"

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ jobs:
2323
run: yarn
2424

2525
- name: Add a changeset for @firebase/app
26+
# pull master so changeset can diff against it
2627
run: |
27-
git pull -f origin master:master
28+
git pull -f --no-rebase origin master:master
2829
yarn ts-node-script scripts/ci/add_changeset.ts
2930
3031
- name: Create Release Pull Request

scripts/ci/check_changeset.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ async function parseChangesetFile(changesetFile: string) {
123123
async function main() {
124124
const errors = [];
125125
try {
126-
await exec(`yarn changeset status --since ${baseRef}`);
126+
await exec(`yarn changeset status`);
127127
console.log(`::set-output name=BLOCKING_FAILURE::false`);
128128
} catch (e) {
129129
if (e.message.match('No changesets present')) {

0 commit comments

Comments
 (0)