Fix changeset checker to stop using since option (#5555)

firebase · Sep 28, 2021 · 2ad6ce8 · 2ad6ce8
1 parent addd8b1
commit 2ad6ce8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/check-changeset.yml b/.github/workflows/check-changeset.yml
@@ -24,7 +24,10 @@ jobs:
     - name: Yarn install
       run: yarn
     - name: Run changeset script
-      run: yarn ts-node-script scripts/ci/check_changeset.ts
+      # pull master so changeset can diff against it
+      run: |
+        git pull -f --no-rebase origin master:master
+        yarn ts-node-script scripts/ci/check_changeset.ts
       id: check-changeset
     - name: Print changeset checker output
       run: echo "${{steps.check-changeset.outputs.CHANGESET_ERROR_MESSAGE}}"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,8 +23,9 @@ jobs:
         run: yarn
 
       - name: Add a changeset for @firebase/app
+        # pull master so changeset can diff against it
         run: |
-          git pull -f origin master:master
+          git pull -f --no-rebase origin master:master
           yarn ts-node-script scripts/ci/add_changeset.ts
 
       - name: Create Release Pull Request

diff --git a/scripts/ci/check_changeset.ts b/scripts/ci/check_changeset.ts
@@ -123,7 +123,7 @@ async function parseChangesetFile(changesetFile: string) {
 async function main() {
   const errors = [];
   try {
-    await exec(`yarn changeset status --since ${baseRef}`);
+    await exec(`yarn changeset status`);
     console.log(`::set-output name=BLOCKING_FAILURE::false`);
   } catch (e) {
     if (e.message.match('No changesets present')) {