Skip to content

Commit 5cfc881

Browse files
authored
Updates for Spack CI (#959)
1 parent 5504814 commit 5cfc881

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

.github/workflows/spack.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ on:
1010
- cron: "0 2 * * TUE"
1111
workflow_dispatch:
1212
inputs:
13-
spack_repo:
14-
description: "Spack repository to test"
15-
default: "spack/spack"
13+
spack_package_repo:
14+
description: "Spack package repository to test"
15+
default: "spack/spack-packages"
1616
type: string
17-
spack_ref:
18-
description: "Spack repository branch/tag to test"
17+
spack_package_ref:
18+
description: "Spack package repository branch/tag to test"
1919
default: "develop"
2020
type: string
2121
basix_version:
@@ -35,18 +35,20 @@ jobs:
3535
apt-get install -y g++ gfortran # compilers
3636
3737
- name: Get Spack
38-
if: github.event_name != 'workflow_dispatch'
3938
uses: actions/checkout@v5
4039
with:
4140
path: ./spack
4241
repository: spack/spack
43-
- name: Get Spack
42+
43+
- name: Get Spack packages
4444
if: github.event_name == 'workflow_dispatch'
45-
uses: actions/checkout@v5
46-
with:
47-
path: ./spack
48-
repository: ${{ github.event.inputs.spack_repo }}
49-
ref: ${{ github.event.inputs.spack_ref }}
45+
run: |
46+
. ./spack/share/spack/setup-env.sh
47+
spack repo update
48+
spack repo add --name test_pkgs https://github.com/${{ github.event.inputs.spack_package_repo }}.git ~/test_pkgs
49+
spack repo update --branch ${{ github.event.inputs.spack_package_ref }} test_pkgs
50+
spack repo list
51+
spack config get repos
5052
5153
- name: Install Basix and run tests
5254
if: github.event_name != 'workflow_dispatch'
@@ -55,12 +57,10 @@ jobs:
5557
spack env create main
5658
spack env activate main
5759
spack add py-fenics-basix
58-
spack install --test=root
5960
- name: Install Basix and run tests
6061
if: github.event_name == 'workflow_dispatch'
6162
run: |
6263
. ./spack/share/spack/setup-env.sh
6364
spack env create main
6465
spack env activate main
6566
spack add py-fenics-basix@${{ github.event.inputs.basix_version }}
66-
spack install --test=root

0 commit comments

Comments
 (0)