Skip to content

Commit

Permalink
.github: add merge_group trigger for merge queue (cosmos#972)
Browse files Browse the repository at this point in the history
In order to run the CI when the PRs are in the merge queue we need to
add the `merge_group` trigger to the CI. This PR is a blocker to using
the merge queue.
  • Loading branch information
MSevey authored Jun 2, 2023
1 parent f6c871c commit c0bcb89
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- 'v[0-9]+\.[0-9]+\.[0-9]+'
- 'v[0-9]+\.[0-9]+\.[0-9]+-rc(?:[0-9]+|\.[0-9]+)'
pull_request:
merge_group:
workflow_dispatch:
# Inputs the workflow accepts.
inputs:
Expand All @@ -26,12 +27,12 @@ jobs:
lint:
uses: ./.github/workflows/lint.yml
with:
GO_VERSION: '1.20'
GO_VERSION: "1.20"

test:
uses: ./.github/workflows/test.yml
with:
GO_VERSION: '1.20'
GO_VERSION: "1.20"

proto:
uses: ./.github/workflows/proto.yml
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
workflow_call:
inputs:
GO_VERSION:
description: 'Go version to use'
description: "Go version to use"
type: string
required: true

Expand All @@ -23,17 +23,17 @@ jobs:
# run: git diff --exit-code

unit_test:
name: Unit Tests Coverage
name: Run Unit Tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: set up go
uses: actions/setup-go@v4
with:
go-version: ${{ inputs.GO_VERSION }}
- name: Test & Coverage
- name: Run unit test
run: make test-unit
- name: upload coverage
- name: upload coverage report
uses: codecov/codecov-action@v3.1.3
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down

0 comments on commit c0bcb89

Please sign in to comment.