Skip to content

Commit

Permalink
Merge pull request #7629 from Agoric/use-github-merge-groups
Browse files Browse the repository at this point in the history
update workflows to trigger merge_group checks
  • Loading branch information
warner authored May 5, 2023
2 parents f75cfb8 + 8560276 commit b1a7a3a
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 12 deletions.
17 changes: 5 additions & 12 deletions .github/workflows/deployment-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,14 @@ on:
tags:
- '@agoric/sdk@*'
pull_request:
types:
- opened
- reopened
- synchronize
- ready_for_review
- labeled
- auto_merge_enabled
merge_group:

jobs:
pre_check:
uses: ./.github/workflows/pre-check-integration.yml
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
deployment-test:
needs: pre_check
if: needs.pre_check.outputs.should_run == 'true'
runs-on: ubuntu-22.04 # jammy (LTS)
steps:
- uses: actions/checkout@v3
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- master
- release-pismo
pull_request:
merge_group:
permissions:
contents: read
# Optional: allow read access to pull request. Use with `only-new-issues` option.
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- ready_for_review
- labeled
- auto_merge_enabled
merge_group:

jobs:
pre_check:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/mergify-ready.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
- ready_for_review
- labeled
- auto_merge_enabled
merge_group:

jobs:
pre_check:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Protobuf
# This workflow is only run when a .proto file has been changed
on:
pull_request:
merge_group:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-all-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ name: Test all Packages

on:
pull_request:
merge_group:
push:
branches: [master]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-dapp-card-store.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Test Dapp Card Store

on:
pull_request:
merge_group:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-dapp-fungible-faucet.yml.DISABLED
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Test Dapp Fungible Faucet

on:
pull_request:
merge_group:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-dapp-otc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Test Dapp OTC Desk

on:
pull_request:
merge_group:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-dapp-pegasus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Test Dapp Pegasus

on:
pull_request:
merge_group:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-dapp-simple-exchange.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Test Dapp Simple Exchange

on:
pull_request:
merge_group:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-dapp-treasury.yml.DISABLED
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Test Dapp Treasury

on:
pull_request:
merge_group:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Test Documentation

on:
pull_request:
merge_group:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-golang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Test Golang

on:
pull_request:
merge_group:
push:
branches: [master]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-scripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Run scripts tests

on:
pull_request:
merge_group:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down

0 comments on commit b1a7a3a

Please sign in to comment.