Unverified Commit bfbe25e5 authored by Luca Palmieri's avatar Luca Palmieri Committed by GitHub
Browse files

Do not skip CI jobs for merge queue events. (#2356) 

* Do not skip for merge queue events.

* Fix quotes.
parent b3b33932

.github/workflows/ci-pr.yml

+5 −4
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ name: CI 
on:

  pull_request:

  merge_group:

    types: [checks_requested]



# Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed

concurrency:
@@ -22,7 +23,7 @@ jobs: 
  # The login password is encrypted with the repo secret DOCKER_LOGIN_TOKEN_PASSPHRASE

  save-docker-login-token:

    name: Save a docker login token

    if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' }}

    if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' || toJSON(github.event.merge_group) != '{}' }}

    outputs:

      docker-login-password: ${{ steps.set-token.outputs.docker-login-password }}

    permissions:
@@ -52,7 +53,7 @@ jobs: 
  acquire-base-image:

    name: Acquire Base Image

    needs: save-docker-login-token

    if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' }}

    if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' || toJSON(github.event.merge_group) != '{}' }}

    runs-on: ubuntu-latest

    env:

      ENCRYPTED_DOCKER_PASSWORD: ${{ needs.save-docker-login-token.outputs.docker-login-password }}
@@ -87,7 +88,7 @@ jobs: 
    needs:

    - save-docker-login-token

    - acquire-base-image

    if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' }}

    if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' || toJSON(github.event.merge_group) != '{}' }}

    uses: ./.github/workflows/ci.yml

    with:

      run_sdk_examples: true
@@ -98,7 +99,7 @@ jobs: 
  # The PR bot requires a Docker build image, so make it depend on the `acquire-base-image` job.

  pr_bot:

    name: PR Bot

    if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' }}

    if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' || toJSON(github.event.merge_group) != '{}' }}

    needs: acquire-base-image

    uses: ./.github/workflows/pull-request-bot.yml

    with: