From 03f0a5845456683ec7c9da6c5aceb91df0e95309 Mon Sep 17 00:00:00 2001 From: Radu Popa Date: Wed, 14 May 2025 21:09:05 +0200 Subject: [PATCH 1/2] fix(cicd): move condition check for build in reusable workflow --- .github/workflows/build-push-container.yml | 5 +++++ .github/workflows/build-push-containers-all.yml | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-push-container.yml b/.github/workflows/build-push-container.yml index d32b06e65..e01c7b2fc 100644 --- a/.github/workflows/build-push-container.yml +++ b/.github/workflows/build-push-container.yml @@ -18,11 +18,16 @@ on: jobs: container-build: name: Build ${{ inputs.container_name }} ${{ matrix.architecture }} + if: > + (github.event_name == 'pull_request' && github.event.action == 'labeled' && github.event.label.name == 'cicd:movement-containers') + || github.ref == 'refs/heads/main' + || startsWith(github.ref, 'refs/tags/') strategy: matrix: architecture: [x86_64, arm64] runs-on: ${{ matrix.architecture == 'x86_64' && 'buildjet-16vcpu-ubuntu-2204' || 'buildjet-16vcpu-ubuntu-2204-arm' }} steps: + - name: Checkout repository uses: actions/checkout@v4 with: diff --git a/.github/workflows/build-push-containers-all.yml b/.github/workflows/build-push-containers-all.yml index 4064892f3..b67dbc96b 100644 --- a/.github/workflows/build-push-containers-all.yml +++ b/.github/workflows/build-push-containers-all.yml @@ -29,11 +29,7 @@ jobs: echo "${GITHUB_CONTEXT}" build-push-checked-containers: - if: > - contains(github.event.pull_request.labels.*.name, 'cicd:movement-containers') - || github.ref == 'refs/heads/main' - || github.event.label.name == 'cicd:movement-containers' - || startsWith(github.ref, 'refs/tags/') + uses: ./.github/workflows/build-push-container.yml name: Build Push Checked Containers From e0b1623afa3fc3ee0e8c2407ed66c1a5f3793a05 Mon Sep 17 00:00:00 2001 From: Radu Popa Date: Wed, 14 May 2025 22:08:59 +0200 Subject: [PATCH 2/2] dummpy PR --- .github/workflows/build-push-containers-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-push-containers-all.yml b/.github/workflows/build-push-containers-all.yml index b67dbc96b..8e4c84f33 100644 --- a/.github/workflows/build-push-containers-all.yml +++ b/.github/workflows/build-push-containers-all.yml @@ -154,4 +154,4 @@ jobs: - bridge-setup - helios with: - container_name: ${{ matrix.container_name }} \ No newline at end of file + container_name: ${{ matrix.container_name }}