Skip to content

Commit

Permalink
github_ci: enable using github merge queue
Browse files Browse the repository at this point in the history
Enable usage of GitHub merge queue feature.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
  • Loading branch information
MatiasElo committed Oct 17, 2023
1 parent bcb1aa0 commit c5e0aa8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-pipeline-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI arm64
# github.repository has been used to ensure CI is only run on the repo where
# self-hosted runners are installed. This will prevent [self-hosted, ARM64] CI failing on forks

on: [push, pull_request]
on: [push, pull_request, merge_group]
env:
ARCH: arm64
CC: gcc

Check failure on line 9 in .github/workflows/ci-pipeline-arm64.yml

View workflow job for this annotation

GitHub Actions / Checkpatch

WARNING: Do not use whitespace before Cc:

Check failure on line 9 in .github/workflows/ci-pipeline-arm64.yml

View workflow job for this annotation

GitHub Actions / Checkpatch

ERROR: Unrecognized email address: 'gcc'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI x86_64

on: [push, pull_request]
on: [push, pull_request, merge_group]
env:
ARCH: x86_64
CC: gcc

Check failure on line 6 in .github/workflows/ci-pipeline.yml

View workflow job for this annotation

GitHub Actions / Checkpatch

WARNING: Do not use whitespace before Cc:

Check failure on line 6 in .github/workflows/ci-pipeline.yml

View workflow job for this annotation

GitHub Actions / Checkpatch

ERROR: Unrecognized email address: 'gcc'

Check failure on line 6 in .github/workflows/ci-pipeline.yml

View workflow job for this annotation

GitHub Actions / Checkpatch

WARNING: Duplicate signature
Expand Down

0 comments on commit c5e0aa8

Please sign in to comment.