Merge branch 'canary' into upgrade/webpack-5

vercel · Jan 26, 2021 · acaff0b · acaff0b
2 parents 144eea0 + 35efe8d
commit acaff0b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -15,6 +15,9 @@ jobs:
       docsChange: ${{ steps.docs-change.outputs.DOCS_CHANGE }}
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 25
+
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - run: yarn install --frozen-lockfile --check-files
       - run: node run-tests.js --timings --write-timings -g 1/1
@@ -136,6 +139,8 @@ jobs:
       YARN_COMPRESSION_LEVEL: '0'
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 25
 
       - run: echo ::set-output name=DOCS_CHANGE::$(node skip-docs-change.js echo 'not-docs-only-change')
         id: docs-change
@@ -164,6 +169,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 25
 
       - run: echo ::set-output name=DOCS_CHANGE::$(node skip-docs-change.js echo 'not-docs-only-change')
         id: docs-change
@@ -187,6 +194,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 25
 
       - run: echo ::set-output name=DOCS_CHANGE::$(node skip-docs-change.js echo 'not-docs-only-change')
         id: docs-change

diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml
@@ -1,10 +1,6 @@
 name: Cancel
 on:
   pull_request_target:
-    branches-ignore:
-      # don't run cancel job for branches named canary until
-      # it no longer cancels the main canary branches jobs
-      - canary
     types:
       - edited
       - synchronize

diff --git a/.github/workflows/pull_request_stats.yml b/.github/workflows/pull_request_stats.yml
@@ -10,6 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 25
+
       - run: echo ::set-output name=DOCS_CHANGE::$(node skip-docs-change.js echo 'not-docs-only-change')
         id: docs-change
       - uses: ./.github/actions/next-stats-action

diff --git a/skip-docs-change.js b/skip-docs-change.js
@@ -9,7 +9,7 @@ async function main() {
   await exec('git fetch origin canary')
 
   const { stdout: changedFilesOutput } = await exec(
-    'git diff origin/canary --name-only'
+    'git diff origin/canary... --name-only'
   )
   const changedFiles = changedFilesOutput
     .split('\n')