Skip to content

Commit

Permalink
Update workflow cancel handling (#50442)
Browse files Browse the repository at this point in the history
The built-in cancel handling doesn't have our desired behavior so this
disables it
  • Loading branch information
ijjk committed May 28, 2023
1 parent d0c1edd commit 105ac17
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@ name: build-and-test
on:
push:
branches: ['canary']
pull_request_target:
pull_request:
types: [opened, synchronize]

concurrency:
group: ${{ github.ref }}-build-and-test
cancel-in-progress: true

env:
NAPI_CLI_VERSION: 2.14.7
TURBO_VERSION: 1.9.6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cancel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ jobs:
steps:
- uses: styfle/cancel-workflow-action@0.9.1
with:
workflow_id: 444921, 444987
workflow_id: 444921, 444987, 57419851
access_token: ${{ github.token }}
2 changes: 1 addition & 1 deletion .github/workflows/pull_request_stats.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
on:
pull_request_target:
pull_request:
types: [opened, synchronize]

name: Generate Pull Request Stats
Expand Down
2 changes: 1 addition & 1 deletion scripts/run-for-change.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ async function main() {
// if we are on the canary branch only diff current commit
const toDiff = isCanary
? `${process.env.GITHUB_SHA || 'canary'}~`
: 'origin/canary HEAD'
: 'origin/canary...'

const changesResult = await exec(`git diff ${toDiff} --name-only`).catch(
(err) => {
Expand Down

0 comments on commit 105ac17

Please sign in to comment.