Skip to content

Commit 0ca22e5

Browse files
committed
Fix Spack CI by installing into builtin repo
- Copy package into spack/var/spack/repos/builtin/packages/mfc/ - Avoid external repo creation which has CMakePackage import issues - Use standard 'from spack.package import *' import pattern - Builtin repo packages have CMakePackage available automatically
1 parent 63f2f7d commit 0ca22e5

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

.github/workflows/spack.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,17 @@ jobs:
3434
. spack/share/spack/setup-env.sh
3535
spack compiler find
3636
37-
- name: Create Spack Repository
37+
- name: Install Package into Spack
3838
run: |
3939
. spack/share/spack/setup-env.sh
40-
spack repo create mfc-repo mfc
41-
mkdir -p mfc-repo/spack_repo/mfc/packages/mfc
42-
cp packaging/spack/package.py mfc-repo/spack_repo/mfc/packages/mfc/
43-
spack repo add mfc-repo/spack_repo/mfc
40+
# Copy package directly into Spack's builtin repo
41+
mkdir -p spack/var/spack/repos/builtin/packages/mfc
42+
cp packaging/spack/package.py spack/var/spack/repos/builtin/packages/mfc/
4443
4544
- name: Run Spack Style Check
4645
run: |
4746
. spack/share/spack/setup-env.sh
48-
spack style mfc-repo/spack_repo/mfc/packages/mfc/package.py
47+
spack style spack/var/spack/repos/builtin/packages/mfc/package.py
4948
5049
- name: Run Spack Audit
5150
run: |
@@ -79,13 +78,12 @@ jobs:
7978
. spack/share/spack/setup-env.sh
8079
spack compiler find
8180
82-
- name: Create Spack Repository
81+
- name: Install Package into Spack
8382
run: |
8483
. spack/share/spack/setup-env.sh
85-
spack repo create mfc-repo mfc
86-
mkdir -p mfc-repo/spack_repo/mfc/packages/mfc
87-
cp packaging/spack/package.py mfc-repo/spack_repo/mfc/packages/mfc/
88-
spack repo add mfc-repo/spack_repo/mfc
84+
# Copy package directly into Spack's builtin repo
85+
mkdir -p spack/var/spack/repos/builtin/packages/mfc
86+
cp packaging/spack/package.py spack/var/spack/repos/builtin/packages/mfc/
8987
9088
- name: Test Default Spec
9189
run: |

packaging/spack/package.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
55

6-
from spack import *
6+
from spack.package import *
77

88

99
class Mfc(CMakePackage):

0 commit comments

Comments
 (0)