Unverified Commit 105ac170 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Update workflow cancel handling (#50442)

The built-in cancel handling doesn't have our desired behavior so this
disables it
parent d0c1edd9
...@@ -3,13 +3,9 @@ name: build-and-test ...@@ -3,13 +3,9 @@ name: build-and-test
on: on:
push: push:
branches: ['canary'] branches: ['canary']
pull_request_target: pull_request:
types: [opened, synchronize] types: [opened, synchronize]
concurrency:
group: ${{ github.ref }}-build-and-test
cancel-in-progress: true
env: env:
NAPI_CLI_VERSION: 2.14.7 NAPI_CLI_VERSION: 2.14.7
TURBO_VERSION: 1.9.6 TURBO_VERSION: 1.9.6
......
...@@ -13,5 +13,5 @@ jobs: ...@@ -13,5 +13,5 @@ jobs:
steps: steps:
- uses: styfle/cancel-workflow-action@0.9.1 - uses: styfle/cancel-workflow-action@0.9.1
with: with:
workflow_id: 444921, 444987 workflow_id: 444921, 444987, 57419851
access_token: ${{ github.token }} access_token: ${{ github.token }}
on: on:
pull_request_target: pull_request:
types: [opened, synchronize] types: [opened, synchronize]
name: Generate Pull Request Stats name: Generate Pull Request Stats
......
...@@ -76,7 +76,7 @@ async function main() { ...@@ -76,7 +76,7 @@ async function main() {
// if we are on the canary branch only diff current commit // if we are on the canary branch only diff current commit
const toDiff = isCanary const toDiff = isCanary
? `${process.env.GITHUB_SHA || 'canary'}~` ? `${process.env.GITHUB_SHA || 'canary'}~`
: 'origin/canary HEAD' : 'origin/canary...'
const changesResult = await exec(`git diff ${toDiff} --name-only`).catch( const changesResult = await exec(`git diff ${toDiff} --name-only`).catch(
(err) => { (err) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment