Skip to content

Commit

Permalink
Add merge group CI target
Browse files Browse the repository at this point in the history
  • Loading branch information
franziskuskiefer authored Jul 7, 2023
1 parent cfc2f92 commit b898bea
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/benchmark_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- 'hacl-star-**'
pull_request:
workflow_dispatch:
merge_group:

jobs:
default:
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@ on:
- LICENSE-APACHE
- README.md
workflow_dispatch:
merge_group:
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
linux:
if: ${{ github.event_name == 'merge_group' }}
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down Expand Up @@ -88,6 +91,7 @@ jobs:
name: linux_${{ matrix.compiler }}_v${{ matrix.version }}_${{ matrix.bits }}_${{ matrix.edition }}

macos:
if: ${{ github.event_name == 'merge_group' }}
runs-on: macos-latest
strategy:
matrix:
Expand Down Expand Up @@ -154,6 +158,7 @@ jobs:
name: macos_${{ matrix.compiler }}_v${{ matrix.version }}_${{ matrix.bits }}_${{ matrix.target }}

windows:
if: ${{ github.event_name == 'merge_group' }}
runs-on: windows-latest
strategy:
matrix:
Expand Down Expand Up @@ -206,6 +211,7 @@ jobs:
# ----------------------------------------------------------------------------

android:
if: ${{ github.event_name == 'merge_group' }}
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -232,6 +238,7 @@ jobs:
name: ${{ matrix.target }}

s390x-gcc:
if: ${{ github.event_name == 'merge_group' }}
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down Expand Up @@ -266,6 +273,7 @@ jobs:
# ----------------------------------------------------------------------------

default:
if: ${{ github.event_name == 'merge_group' }}
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- LICENSE-APACHE
- README.md
workflow_dispatch:
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ on:
- LICENSE-APACHE
- README.md
workflow_dispatch:
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- README.md
workflow_dispatch:
pull_request:
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- 'hacl-star-**'
pull_request:
workflow_dispatch:
merge_group:

jobs:
default:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ocaml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ on:
- LICENSE-APACHE
- README.md
workflow_dispatch:
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ on:
- LICENSE-APACHE
- README.md
workflow_dispatch:
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/sanitizer_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- LICENSE-APACHE
- README.md
workflow_dispatch:
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down

0 comments on commit b898bea

Please sign in to comment.