Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/master-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
submodules: 'true'

- name: Setup
run: source /home/hicr/.bashrc && meson setup build -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
run: source /home/hicr/.bashrc && meson setup build -Dbuildtype=debug -Db_coverage=true -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true

- name: Compile
run: source /home/hicr/.bashrc && meson compile -C build
Expand Down
21 changes: 2 additions & 19 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ env:
DOCKERIMAGE: ghcr.io/algebraic-programming/taskr/buildenv

jobs:
build-docker-arm64:
uses: Algebraic-Programming/TaskR/.github/workflows/master-build-workflow.yml@main
with:
os: ubuntu-24.04-arm
arch: arm64

build-docker-amd64:
uses: Algebraic-Programming/TaskR/.github/workflows/master-build-workflow.yml@main
with:
Expand All @@ -25,11 +19,10 @@ jobs:

push-buildenv-manifest:
runs-on: ubuntu-latest
needs: [ build-docker-amd64, build-docker-arm64 ]
needs: [ build-docker-amd64]
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-amd64.result, 'skipped'))
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand All @@ -45,16 +38,6 @@ jobs:
run:
docker buildx imagetools create --tag ${{ env.DOCKERIMAGE }}:latest ${{ env.DOCKERIMAGE }}:amd64-latest ${{ env.DOCKERIMAGE }}:arm64-latest

compile-and-test-arm64:
needs: [ push-buildenv-manifest ]
if: |
always() &&
(contains(needs.push-buildenv-manifest.result, 'success') || contains(needs.push-buildenv-manifest.result, 'skipped'))
uses: Algebraic-Programming/TaskR/.github/workflows/master-test-workflow.yml@main
with:
os: ubuntu-24.04-arm
arch: arm64

compile-and-test-amd64:
needs: [ push-buildenv-manifest ]
if: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-development-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ jobs:
docker run --name taskr --shm-size=1024M --privileged -v $PWD:/home/hicr/taskr -w /home/hicr/taskr -td ${{ env.DOCKERIMAGE }}:${{ inputs.arch }}-latest bash

- name: Setup
run: docker exec -u hicr taskr bash -c "meson setup build -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true"
run: docker exec -u hicr taskr bash -c "meson setup build -Dbuildtype=debug -Db_coverage=true -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true"

- name: Compile
run: docker exec -u hicr taskr bash -c "meson compile -C build"
Expand Down Expand Up @@ -271,7 +271,7 @@ jobs:
submodules: 'true'

- name: Setup
run: source /home/hicr/.bashrc && meson setup build -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
run: source /home/hicr/.bashrc && meson setup build -Dbuildtype=debug -Db_coverage=true -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true

- name: Compile
run: source /home/hicr/.bashrc && meson compile -C build
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/pr-development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ concurrency:


jobs:
ci-arm64:
uses: Algebraic-Programming/TaskR/.github/workflows/pr-development-workflow.yml@main
with:
os: ubuntu-24.04-arm
arch: arm64

ci-amd64:
uses: Algebraic-Programming/TaskR/.github/workflows/pr-development-workflow.yml@main
with:
Expand Down
Loading