Skip to content

Commit

Permalink
chore: cancel running pull request jobs on new push (#4339)
Browse files Browse the repository at this point in the history
Co-authored-by: Michael Genson <71845777+michael-genson@users.noreply.github.com>
  • Loading branch information
Kuchenpirat and michael-genson authored Oct 9, 2024
1 parent 655122c commit d36041f
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ name: "CodeQL"
on:
push:
branches: [ "mealie-next" ]
pull_request:
branches: [ "mealie-next" ]
schedule:
- cron: '36 9 * * 3'
workflow_call:

jobs:
analyze:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
name: E2E Tests
on:
pull_request:
branches:
- mealie-next
workflow_call:

jobs:
test:
timeout-minutes: 60
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/pull-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
branches:
- mealie-next

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

jobs:
pull-request-lint:
name: "Lint PR"
Expand All @@ -21,3 +25,15 @@ jobs:
container-scanning:
name: "Trivy Container Scanning"
uses: ./.github/workflows/partial-trivy-container-scanning.yml

end-to-end:
name: "End-to-End Tests"
uses: ./.github/workflows/e2e.yml

code-ql:
name: "CodeQL"
uses: ./.github/workflows/codeql.yml
permissions:
actions: read
contents: read
security-events: write

0 comments on commit d36041f

Please sign in to comment.