This is an automated email from the ASF dual-hosted git repository. ash pushed a commit to branch revert-20023-fix-actions-concurrency in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 68845c17c278c32dee9bf5dcdcecbabc7f38a742 Author: Ash Berlin-Taylor <[email protected]> AuthorDate: Fri Dec 3 18:06:37 2021 +0000 Revert "Work around change in GH Actions concurrency expression evaluation (#20023)" This reverts commit 42c46842f415da6bca09fa83d636ef1751243692. --- .github/workflows/build-images.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 4c38674..3f7c51a 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -50,7 +50,7 @@ env: GITHUB_REGISTRY_PUSH_IMAGE_TAG: ${{ github.event.pull_request.head.sha || github.sha }} concurrency: - group: build-${{ (github.event_name == 'pull_request' && github.event.pull_request.number) || github.ref }} + group: build-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bd55f7..e730269 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ env: GITHUB_REGISTRY_WAIT_FOR_IMAGE: ${{ secrets.AIRFLOW_GITHUB_REGISTRY_WAIT_FOR_IMAGE != 'false' }} concurrency: - group: ci-${{ (github.event_name == 'pull_request' && github.event.pull_request.number) || github.ref }} + group: ci-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true jobs:
