Skip to content

Commit

Permalink
dir
Browse files Browse the repository at this point in the history
  • Loading branch information
haampie committed May 6, 2024
1 parent 48ce30c commit c0b691c
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/clingo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
. spack/share/spack/setup-env.sh
spack python clingo/scripts/install_clingo.py
mkdir -p binary-mirror
spack buildcache push --unsigned --force $PWD/binary-mirror clingo-bootstrap
spack buildcache push --unsigned ./binary-mirror clingo-bootstrap
- uses: actions/upload-artifact@v3
with:
name: clingo_binary_mirror
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gnupg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
# Inject flags to have compatibility with MacOSX version 10.13 or higher
spack install gnupg cflags="-mmacosx-version-min=10.13"
spack buildcache push --unsigned --force $PWD/binary-mirror gnupg
spack buildcache push --unsigned ./binary-mirror gnupg
- uses: actions/upload-artifact@v3
with:
name: gnupg_binary_mirror
Expand Down
2 changes: 1 addition & 1 deletion clingo/Dockerfile.manylinux2014
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ RUN ./bootstrap_clingo2014.sh 311
RUN ./bootstrap_clingo2014.sh 312

RUN mkdir -p /root/binary-mirror \
spack buildcache push --unsigned --force /root/binary-mirror $(spack find --format="/{hash}" clingo-bootstrap)
spack buildcache push --unsigned ./binary-mirror $(spack find --format="/{hash}" clingo-bootstrap)
7 changes: 1 addition & 6 deletions clingo/scripts/bootstrap_clingo_manylinux2014.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
#!/bin/bash
#!/bin/sh

# Cycle over all the Python interpreters in manylinux2014
# and install the corresponding clingo-bootstrap binary
for PYTHON in /opt/python/cp${1}*/bin/python; do

# Install clingo using the current Python as an external
# The Python version will be output to stdout
${PYTHON} spack/bin/spack python install_clingo.py

done

# Create a binary mirror
#/bin/bash create_binary_mirror.sh
5 changes: 0 additions & 5 deletions clingo/scripts/create_binary_mirror.sh

This file was deleted.

3 changes: 1 addition & 2 deletions gnupg/Dockerfile.manylinux2014
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ RUN spack compiler find
RUN spack config add config:install_tree:padded_length:256
RUN spack python -c "import archspec.cpu;print(archspec.cpu.host().family)" > target.txt
RUN spack -c install gnupg "target=$(cat target.txt)"
RUN mkdir -p /home/spack/binary-mirror && \
spack -c buildcache push --unsigned --force /home/spack/binary-mirror gnupg "target=$(cat target.txt)"
RUN spack -c buildcache push --unsigned ./binary-mirror gnupg "target=$(cat target.txt)"
6 changes: 3 additions & 3 deletions patchelf/Dockerfile.manylinux2014
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN git clone https://github.com/spack/spack.git && \
git -C spack checkout -b docker-reference 9b4ca0be40edb02115be94bbc428ac546d63030e
RUN spack external find --not-buildable cmake
RUN spack compiler find
RUN spack config add config:install_tree:padded_length:256
RUN spack python -c "import archspec.cpu;print(archspec.cpu.host().family)" > target.txt
RUN spack -c config:install_tree:padded_length:256 install patchelf "ldflags=-static-libstdc++ -static-libgcc" "target=$(cat target.txt)"
RUN mkdir -p /root/binary-mirror && \
spack -c config:install_tree:padded_length:256 buildcache push --unsigned --force /root/binary-mirror patchelf
RUN spack -c install patchelf "ldflags=-static-libstdc++ -static-libgcc" "target=$(cat target.txt)"
RUN spack -c buildcache push --unsigned ./binary-mirror patchelf

0 comments on commit c0b691c

Please sign in to comment.