From 89748a57e08ddbe80403e0110a1f0cd5ca46c154 Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Mon, 30 Dec 2024 05:35:17 +0000 Subject: [PATCH] incorporate the ci-gh workflow into build-and-test + ensure all workflows have a name --- ...-build-and-test.yml => build-and-test.yml} | 17 ++++++++++++++-- .../{gh-build-docs.yml => build-docs.yml} | 2 ++ .github/workflows/ci-gh.yml | 20 ------------------- 3 files changed, 17 insertions(+), 22 deletions(-) rename .github/workflows/{gh-build-and-test.yml => build-and-test.yml} (96%) rename .github/workflows/{gh-build-docs.yml => build-docs.yml} (99%) delete mode 100644 .github/workflows/ci-gh.yml diff --git a/.github/workflows/gh-build-and-test.yml b/.github/workflows/build-and-test.yml similarity index 96% rename from .github/workflows/gh-build-and-test.yml rename to .github/workflows/build-and-test.yml index 0c3bec4c..759485c4 100644 --- a/.github/workflows/gh-build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -1,4 +1,17 @@ -on: workflow_call +name: "CI: Build and test" + +concurrency: + group: ${{ github.workflow }}-${{ + github.ref_name == 'main' && format('ci-main-build-test-{0}', github.run_id) || + format('ci-pr-build-test-on-{0}-against-branch-{1}', github.event_name, github.ref_name) + }} + cancel-in-progress: true + +on: + push: + branches: + - "pull-request/[0-9]+" + - "main" jobs: build: @@ -332,6 +345,6 @@ jobs: - build secrets: inherit uses: - ./.github/workflows/gh-build-docs.yml + ./.github/workflows/build-docs.yml with: build_ctk_ver: ${{ needs.build.outputs.BUILD_CTK_VER }} diff --git a/.github/workflows/gh-build-docs.yml b/.github/workflows/build-docs.yml similarity index 99% rename from .github/workflows/gh-build-docs.yml rename to .github/workflows/build-docs.yml index 4eabd73d..71f360ba 100644 --- a/.github/workflows/gh-build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -1,3 +1,5 @@ +name: "CI: Build and update docs" + on: workflow_call: inputs: diff --git a/.github/workflows/ci-gh.yml b/.github/workflows/ci-gh.yml deleted file mode 100644 index 091fc4e0..00000000 --- a/.github/workflows/ci-gh.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: CI - -concurrency: - group: ${{ github.workflow }}-${{ - github.ref_name == 'main' && format('ci-main-build-test-{0}', github.run_id) || - format('ci-pr-build-test-on-{0}-against-branch-{1}', github.event_name, github.ref_name) - }} - cancel-in-progress: true - -on: - push: - branches: - - "pull-request/[0-9]+" - - "main" - -jobs: - ci: - uses: - ./.github/workflows/gh-build-and-test.yml - secrets: inherit