Skip to content

Commit

Permalink
ci: allow concurrency on merge to main (#5807)
Browse files Browse the repository at this point in the history
Let's keep concurrency on merges to main so we can be alerted if a
particular commit triggered a failure, etc.
  • Loading branch information
midleman authored Dec 18, 2024
1 parent 7508e74 commit 19c0b0e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/test-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ on:
- main
- 'prerelease/**'

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
e2e-electron:
name: e2e
Expand Down
4 changes: 2 additions & 2 deletions build/secrets/.secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"filename": ".github/workflows/test-merge.yml",
"hashed_secret": "3e26d6750975d678acb8fa35a0f69237881576b0",
"is_verified": false,
"line_number": 22,
"line_number": 18,
"is_secret": false
}
],
Expand Down Expand Up @@ -1944,5 +1944,5 @@
}
]
},
"generated_at": "2024-12-18T16:07:04Z"
"generated_at": "2024-12-18T19:29:32Z"
}

0 comments on commit 19c0b0e

Please sign in to comment.