Skip to content

Commit

Permalink
enable merge_queue
Browse files Browse the repository at this point in the history
  • Loading branch information
poszu committed Nov 19, 2024
1 parent f4de865 commit cb280a7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ on:
workflow_dispatch:
# run for all pull requests and pushes to certain branches
pull_request:
push:
branches:
- staging
- trying
merge_queue:

concurrency:
group: ${{ github.base_ref == 'staging' && 'smci-staging' || format('smci-{0}-{1}', github.workflow, github.ref) }}
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/systest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ on:
log_level:
description: "Log level"
default: "debug"
push:
branches:
- staging
- trying
merge_queue:

env:
GCLOUD_KEY: ${{ secrets.GCLOUD_KEY }}
PROJECT_NAME: ${{ secrets.PROJECT_NAME }}
Expand Down

0 comments on commit cb280a7

Please sign in to comment.