Skip to content

Commit

Permalink
Enable merge_group event in CI (#3674)
Browse files Browse the repository at this point in the history
Replace Bors with GH merge queue
  • Loading branch information
tjtelan committed Nov 8, 2023
1 parent 4549d58 commit 306024a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 23 deletions.
25 changes: 10 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,13 @@
name: CI

permissions: read-all
#permissions:
# contents: read

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

on:
push:
branches:
- staging
- trying
merge_group:
pull_request:
branches: [master]
paths:
Expand Down Expand Up @@ -57,7 +52,7 @@ jobs:
- id: check
run: echo "::set-output name=check::${{ env.ENABLE_CHECK }}"
#- name: Set Staging runs
## if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
## if: github.event_name == 'merge_group'
# run: echo "TEST_RUNS='[r1,r2,r3,r4,r5]'" | tee -a $GITHUB_ENV

# build binaries for linux x86_64/aarch64 musl which is primary OS for testing clusters
Expand Down Expand Up @@ -142,7 +137,7 @@ jobs:
# build other binaries which doesn't need test
build_binaries:
name: Build ${{ matrix.binary }} for ${{ matrix.rust-target }} on (${{ matrix.os }})
if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
if: github.event_name == 'merge_group'
runs-on: ${{ matrix.os }}
strategy:
# fail-fast: false
Expand Down Expand Up @@ -252,10 +247,10 @@ jobs:
steps:
- uses: actions/checkout@v4

# If this job is being run by Bors (it was pushed to staging),
# If this job is being run by merge_group,
# then build and run in release mode
- name: Set RELEASE mode
if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
if: github.event_name == 'merge_group'
shell: bash
run: |
echo "RELEASE=true" | tee -a $GITHUB_ENV
Expand Down Expand Up @@ -1244,7 +1239,7 @@ jobs:
# After this, we are committed for release
docker_push:
name: Publish Docker Image
if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
if: github.event_name == 'merge_group'
needs:
- check
- check_wasm
Expand Down Expand Up @@ -1295,7 +1290,7 @@ jobs:
# When all required jobs pass, bump the `dev` GH prerelease to this commit
bump_github_release:
name: Bump dev tag
if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
if: github.event_name == 'merge_group'
needs:
- docker_push
runs-on: ubuntu-latest
Expand All @@ -1316,7 +1311,7 @@ jobs:
# Upload the build artifacts to the `dev` GH release, overwriting old artifacts
publish_github_helm_pkg:
name: Publish helm chart to GitHub Releases dev
if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
if: github.event_name == 'merge_group'
needs: bump_github_release
runs-on: ubuntu-latest
permissions: write-all
Expand All @@ -1333,7 +1328,7 @@ jobs:
publish_github_binaries:
name: Publish to GitHub Releases dev (${{ matrix.artifact }}-${{ matrix.rust-target }})
if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
if: github.event_name == 'merge_group'
needs:
- bump_github_release
runs-on: ubuntu-latest
Expand Down Expand Up @@ -1398,7 +1393,7 @@ jobs:
# Used by Bors to detect that all required jobs have completed successfully
done:
name: Done
if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
if: github.event_name == 'merge_group'
needs: [publish_github_binaries, publish_github_helm_pkg]
runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_mac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ jobs:
steps:
- uses: actions/checkout@v4

# If this job is being run by Bors (it was pushed to staging),
# If this job is being run by merge_group,
# then build and run in release mode
- name: Set RELEASE mode
if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
if: github.event_name == 'merge_group'
shell: bash
run: |
echo "RELEASE=true" | tee -a $GITHUB_ENV
Expand Down
6 changes: 0 additions & 6 deletions bors.toml

This file was deleted.

0 comments on commit 306024a

Please sign in to comment.