From bb3bc0693d6b39533761c5de34a9e2f4a707fe0c Mon Sep 17 00:00:00 2001 From: "Garth N. Wells" Date: Mon, 16 May 2022 14:30:10 +0100 Subject: [PATCH 1/3] Spack CI fix --- .github/workflows/spack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spack.yml b/.github/workflows/spack.yml index fa9c4c2802b..2806abd99b9 100644 --- a/.github/workflows/spack.yml +++ b/.github/workflows/spack.yml @@ -59,7 +59,7 @@ jobs: run: | . ./spack/share/spack/setup-env.sh spack env activate cpp-main - spack install py-fenics-ffcx + spack install py-fenics-ffcx@main cd dolfinx-main/cpp/ cd demo/poisson cmake . From 0aed46bc1a141c86089588ffd2e39fc88422751e Mon Sep 17 00:00:00 2001 From: "Garth N. Wells" Date: Mon, 16 May 2022 14:32:18 +0100 Subject: [PATCH 2/3] Actions version update --- .github/workflows/spack.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/spack.yml b/.github/workflows/spack.yml index 2806abd99b9..63c159eb43e 100644 --- a/.github/workflows/spack.yml +++ b/.github/workflows/spack.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Get Spack - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: ./spack repository: ${{ github.event.inputs.spack_repo }} @@ -51,7 +51,7 @@ jobs: spack install - name: Get DOLFINx code (to access test files) - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: main path: ./dolfinx-main @@ -68,7 +68,7 @@ jobs: mpirun -np 2 ./demo_poisson - name: Get DOLFINx release code (to access test files) - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: main # ref: v${{ github.event.inputs.spack_branch }} From f0581579b6f2f4554211555ec7fba2ca992a5011 Mon Sep 17 00:00:00 2001 From: "Garth N. Wells" Date: Mon, 16 May 2022 16:34:19 +0100 Subject: [PATCH 3/3] Fix path --- .github/workflows/spack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spack.yml b/.github/workflows/spack.yml index 63c159eb43e..feaff57d279 100644 --- a/.github/workflows/spack.yml +++ b/.github/workflows/spack.yml @@ -104,7 +104,7 @@ jobs: run: | . ./spack/share/spack/setup-env.sh spack env activate py-main - mpirun -np 2 python3 ./dolfinx-main/python/demo_elasticity.py + mpirun -np 2 python3 ./dolfinx-main/python/demo/demo_elasticity.py - name: Run DOLFINx (Python, release) test run: | . ./spack/share/spack/setup-env.sh