Skip to content

Commit

Permalink
Fix action workflow should run on merge_group trigger instead of push
Browse files Browse the repository at this point in the history
  • Loading branch information
infrmtcs committed Feb 25, 2025
1 parent a607ae9 commit fa87b0b
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ env:

on:
push:
branches: [main]
tags: ["v*"]
workflow_dispatch:
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
name: "CodeQL"

on:
push:
branches: [ main ]
merge_group:
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/docs-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
name: Deploy Documentation to GitHub Pages

on:
push:
branches:
- main
merge_group:
workflow_dispatch:

permissions:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/juno-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ on:
push:
tags:
- v*
branches:
- main
pull_request:
merge_group:

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/juno-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Juno Test
on:
push:
branches:
- main
- develop
pull_request:
workflow_dispatch:
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/sync_first_100_blocks_smoke_test.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
name: Sync First 100 Blocks Smoke Test

on:
push:
branches:
- main
pull_request:
branches:
- main
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
name: Container Security

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
schedule:
- cron: '29 19 * * 4'
merge_group:

permissions:
contents: read
Expand Down

0 comments on commit fa87b0b

Please sign in to comment.