Skip to content

Commit e6d1c5c

Browse files
committed
ci: enable manifest push only if both docker images are built
1 parent 3891536 commit e6d1c5c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/master.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
needs: [ build-docker-amd64, build-docker-arm64 ]
2929
if: |
3030
always() &&
31-
(contains(needs.build-docker-amd64.result, 'success') || contains(needs.build-docker-amd64.result, 'skipped')) &&
32-
(contains(needs.build-docker-arm64.result, 'success') || contains(needs.build-docker-arm64.result, 'skipped'))
31+
contains(needs.build-docker-amd64.result, 'success') &&
32+
contains(needs.build-docker-arm64.result, 'success')
3333
steps:
3434
- name: Set up Docker Buildx
3535
uses: docker/setup-buildx-action@v3
@@ -90,8 +90,8 @@ jobs:
9090
needs: [ build-acl-docker-amd64, build-acl-docker-arm64 ]
9191
if: |
9292
always() &&
93-
(contains(needs.build-acl-docker-amd64.result, 'success') || contains(needs.build-acl-docker-amd64.result, 'skipped')) &&
94-
(contains(needs.build-acl-docker-arm64.result, 'success') || contains(needs.build-acl-docker-arm64.result, 'skipped'))
93+
contains(needs.build-acl-docker-amd64.result, 'success') &&
94+
contains(needs.build-acl-docker-arm64.result, 'success')
9595
steps:
9696
- name: Set up Docker Buildx
9797
uses: docker/setup-buildx-action@v3

.github/workflows/pr-development-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ jobs:
269269
uses: actions/checkout@v4
270270

271271
- name: Setup
272-
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
272+
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
273273

274274
- name: Compile
275275
run: source /home/hicr/.bashrc && meson compile -C build

meson_options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ option('compileWarningsAsErrors', type : 'boolean', value : false,
2626

2727
###### Backend-specific options
2828
option('aclPath', type : 'string', value : '',
29-
description: 'Indicates home directory where the acl libraries are e.g., /usr/local/Ascend/ascend-toolkit/<acl version>/)'
29+
description: 'Indicates acl home directory where the include and lib folders are'
3030
)

0 commit comments

Comments
 (0)