From e6d1c5c9ca13e6a6489fb7fb9c004d23469f9afe Mon Sep 17 00:00:00 2001 From: Luca Terracciano Date: Fri, 29 Aug 2025 12:16:20 +0200 Subject: [PATCH] ci: enable manifest push only if both docker images are built --- .github/workflows/master.yml | 8 ++++---- .github/workflows/pr-development-workflow.yml | 2 +- meson_options.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 96d449df..59e1306c 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -28,8 +28,8 @@ jobs: needs: [ build-docker-amd64, build-docker-arm64 ] if: | always() && - (contains(needs.build-docker-amd64.result, 'success') || contains(needs.build-docker-amd64.result, 'skipped')) && - (contains(needs.build-docker-arm64.result, 'success') || contains(needs.build-docker-arm64.result, 'skipped')) + contains(needs.build-docker-amd64.result, 'success') && + contains(needs.build-docker-arm64.result, 'success') steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -90,8 +90,8 @@ jobs: needs: [ build-acl-docker-amd64, build-acl-docker-arm64 ] if: | always() && - (contains(needs.build-acl-docker-amd64.result, 'success') || contains(needs.build-acl-docker-amd64.result, 'skipped')) && - (contains(needs.build-acl-docker-arm64.result, 'success') || contains(needs.build-acl-docker-arm64.result, 'skipped')) + contains(needs.build-acl-docker-amd64.result, 'success') && + contains(needs.build-acl-docker-arm64.result, 'success') steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/pr-development-workflow.yml b/.github/workflows/pr-development-workflow.yml index 7344d8b3..411dd53f 100644 --- a/.github/workflows/pr-development-workflow.yml +++ b/.github/workflows/pr-development-workflow.yml @@ -269,7 +269,7 @@ jobs: uses: actions/checkout@v4 - name: Setup - run: source /home/hicr/.bashrc && meson setup build -Dbackends=hwloc,pthreads,mpi,lpf,nosv,boost,opencl -Dfrontends=channel,RPCEngine,tasking,objectStore -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true + run: source /home/hicr/.bashrc && meson setup build -Dbackends=hwloc,pthreads,mpi,lpf,nosv,boost,opencl,acl -Dfrontends=channel,RPCEngine,tasking,objectStore -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true - name: Compile run: source /home/hicr/.bashrc && meson compile -C build diff --git a/meson_options.txt b/meson_options.txt index d9739d48..02ce12c2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -26,5 +26,5 @@ option('compileWarningsAsErrors', type : 'boolean', value : false, ###### Backend-specific options option('aclPath', type : 'string', value : '', - description: 'Indicates home directory where the acl libraries are e.g., /usr/local/Ascend/ascend-toolkit//)' + description: 'Indicates acl home directory where the include and lib folders are' )