Skip to content

Commit e73c5af

Browse files
committed
Update artifact path and gnupg repository
1 parent fa225e4 commit e73c5af

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

.github/workflows/clingo.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ jobs:
137137
- uses: actions/download-artifact@v6
138138

139139
- run: ./spack/bin/spack python ./generate_bootstrap_json.py clingo
140+
140141
- uses: actions/upload-artifact@v5
141142
with:
142143
name: clingo_manifest

.github/workflows/gnupg.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,15 @@ jobs:
4646
run: |
4747
brew install gawk perl
4848
49+
. spack/share/spack/setup-env.sh
50+
spack repo set --destination spack/var/spack/repos/builtin builtin
51+
spack repo update
52+
4953
# Disables internationalization to avoid linking to
5054
# libintl on MacOS, since that will make the binary
5155
# non portable
5256
git -C spack apply "$PWD/gnupg/patches/gnupg_macos.patch"
5357
54-
. spack/share/spack/setup-env.sh
55-
5658
rm -rf $(spack location -p podman)
5759
5860
spack external find --not-buildable gawk perl

generate_bootstrap_json.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,23 @@ def run(pkg: str, deps=dt.NONE, python: bool = False):
3434
name = "clingo-bootstrap" if pkg == "clingo" else pkg
3535
shas = {
3636
tarball_hash(tarball): sha256(tarball)
37-
for tarball in glob.glob("./build_cache/**/*.spack", recursive=True)
37+
for tarball in glob.glob("./clingo_binary_mirror*/**/*.spack", recursive=True)
3838
}
3939

4040
specs = [
41-
spack.spec.Spec.from_specfile(f) for f in glob.glob("./build_cache/*.json") if name in f
41+
spack.spec.Spec.from_specfile(f)
42+
for f in glob.glob("./build_cache/*.json")
43+
if name in f
4244
]
4345

4446
assert len(specs) > 0, f"No specs found for {name}"
4547

4648
fmt = "{name}{@version}{%compiler.name} platform={platform} target={target}"
4749

4850
if python:
49-
fmt_spec = lambda s: f"{s.format(fmt)} ^python@{s.dependencies('python')[0].version}"
51+
fmt_spec = (
52+
lambda s: f"{s.format(fmt)} ^python@{s.dependencies('python')[0].version}"
53+
)
5054
else:
5155
fmt_spec = lambda s: s.format(fmt)
5256

0 commit comments

Comments
 (0)