Skip to content

Commit 7edf81d

Browse files
authored
ci: fix main CI (#6)
* ci: fix main CI * ci: fix meson commands
1 parent 93cc858 commit 7edf81d

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

.github/workflows/master-test-workflow.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ${{ inputs.os }}
3030
container:
3131
image: ghcr.io/algebraic-programming/taskr/buildenv:latest
32-
options: --user taskr
32+
options: --user hicr
3333
credentials:
3434
username: ${{ github.repository_owner }}
3535
password: ${{ secrets.GITHUB_TOKEN }}
@@ -41,7 +41,7 @@ jobs:
4141
submodules: 'true'
4242

4343
- name: Setup
44-
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
44+
run: source /home/hicr/.bashrc && meson setup build -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
4545

4646
- name: Compile
4747
run: source /home/hicr/.bashrc && meson compile -C build
@@ -51,8 +51,6 @@ jobs:
5151
run: |
5252
echo "Running Tests..."
5353
source /home/hicr/.bashrc
54-
meson setup build --wipe -Db_coverage=true -Dbackends=hwloc,pthreads,mpi,nosv,boost -Dfrontends=channel,RPCEngine,tasking,objectStore -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
55-
meson compile -C build
5654
meson test -C build
5755
echo "Creating coverage report..."
5856
ninja -C build coverage

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,16 +231,14 @@ jobs:
231231
docker run --name taskr --shm-size=1024M --privileged -v $PWD:/home/hicr/taskr -w /home/hicr/taskr -td ${{ env.DOCKERIMAGE }}:${{ inputs.arch }}-latest bash
232232
233233
- name: Setup
234-
run: docker exec -u hicr taskr bash -c "meson setup build -Dbackends=hwloc,pthreads,mpi,lpf,nosv,boost,opencl -Dfrontends=channel,RPCEngine,tasking,objectStore -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true"
234+
run: docker exec -u hicr taskr bash -c "meson setup build -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true"
235235

236236
- name: Compile
237237
run: docker exec -u hicr taskr bash -c "meson compile -C build"
238238

239239
- name: Running tests and creating coverage report
240240
run: |
241241
echo "Running Tests..."
242-
docker exec -u hicr taskr bash -c "source /home/hicr/.bashrc && meson setup build --wipe -Db_coverage=true -Dbackends=hwloc,pthreads,mpi,nosv,boost -Dfrontends=channel,RPCEngine,tasking,objectStore -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true"
243-
docker exec -u hicr taskr bash -c "source /home/hicr/.bashrc && meson compile -C build"
244242
docker exec -u hicr taskr bash -c "source /home/hicr/.bashrc && meson test -C build"
245243
echo "Creating coverage report..."
246244
docker exec -u hicr taskr bash -c "ninja -C build coverage"
@@ -273,7 +271,7 @@ jobs:
273271
submodules: 'true'
274272

275273
- name: Setup
276-
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
274+
run: source /home/hicr/.bashrc && meson setup build -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
277275

278276
- name: Compile
279277
run: source /home/hicr/.bashrc && meson compile -C build
@@ -283,8 +281,6 @@ jobs:
283281
run: |
284282
echo "Running Tests..."
285283
source /home/hicr/.bashrc
286-
meson setup build --wipe -Db_coverage=true -Dbackends=hwloc,pthreads,mpi,nosv,boost -Dfrontends=channel,RPCEngine,tasking,objectStore -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
287-
meson compile -C build
288284
meson test -C build
289285
echo "Creating coverage report..."
290286
ninja -C build coverage

0 commit comments

Comments
 (0)