From 0a352e3230884b3214fa79706505bfdf2cb6071c Mon Sep 17 00:00:00 2001 From: Wenju He Date: Wed, 29 May 2024 12:16:54 +0800 Subject: [PATCH 1/2] [CI] Change verify_default_branch job name to "In-tree build / Linux" Motivation: use the name as check in "Require status checks to pass". The name should be the same for all branches. Branch-Protection #516 --- .github/workflows/on-push-verification.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-push-verification.yml b/.github/workflows/on-push-verification.yml index 7e695c5f..d03722be 100644 --- a/.github/workflows/on-push-verification.yml +++ b/.github/workflows/on-push-verification.yml @@ -25,7 +25,7 @@ on: jobs: verify_default_branch: - name: Verify for `main` branch + name: In-tree build / Linux # ref_name for 'on: push' # base_ref for 'on: pull_request' if: ${{ (github.event_name == 'push' && github.ref_name == 'main') || (github.event_name == 'pull_request' && github.base_ref == 'main') }} From df1c93a771c40d178294c66ebb39b9c365401c72 Mon Sep 17 00:00:00 2001 From: Wenju He Date: Wed, 29 May 2024 12:54:38 +0800 Subject: [PATCH 2/2] remove verify_default_branch which is not run on 17 --- .github/workflows/on-push-verification.yml | 23 ++-------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/.github/workflows/on-push-verification.yml b/.github/workflows/on-push-verification.yml index d03722be..ea7eac6f 100644 --- a/.github/workflows/on-push-verification.yml +++ b/.github/workflows/on-push-verification.yml @@ -4,7 +4,7 @@ # to choose correct dependencies revisions # ===--- -name: On push & pull-request verification +name: In-tree build run-name: '${{ github.event_name }}: ${{ github.base_ref }} ${{ github.ref_name }}' # github.base_ref null for 'on: push' on: @@ -24,29 +24,10 @@ on: jobs: - verify_default_branch: - name: In-tree build / Linux - # ref_name for 'on: push' - # base_ref for 'on: pull_request' - if: ${{ (github.event_name == 'push' && github.ref_name == 'main') || (github.event_name == 'pull_request' && github.base_ref == 'main') }} - runs-on: ubuntu-22.04 - steps: - - - name: Checkout opencl-clang sources for action files - uses: actions/checkout@v3 - - - name: Run build-opencl-clang action - uses: ./.github/actions/build-opencl-clang - with: - ref_llvm: main - ref_translator: main - ref_opencl-clang: ${{ github.ref }} - verify_release_branch: - name: Verify for `ocl-open-*` release branch + name: Linux # ref_name for 'on: push' # base_ref for 'on: pull_request' - if: ${{ github.ref_name != 'main' && github.base_ref != 'main' }} runs-on: ubuntu-22.04 steps: