Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a new workflow for concretization and delete older concretization workflows #646

Merged
merged 25 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions .github/workflows/concretize-lxplus.yaml

This file was deleted.

21 changes: 0 additions & 21 deletions .github/workflows/concretize-ubuntu.yaml

This file was deleted.

69 changes: 69 additions & 0 deletions .github/workflows/concretize.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
on:
push:
branches:
- main
pull_request:
workflow_dispatch:

jobs:
concretize:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.image }}-${{ matrix.build_type }}
cancel-in-progress: true
strategy:
matrix:
image: [alma9, ubuntu22]
build_type: [release, nightly]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Start container
run: |
name=$(echo "${{ github.event.repository.name }}" | tr '[:upper:]' '[:lower:]')
if [ "${{ matrix.image }}" = "alma9" ]; then
docker run --name container --privileged -v ${GITHUB_WORKSPACE}:/key4hep-spack -v ~/.cache/ccache:/root/.cache/ccache -d ghcr.io/key4hep/key4hep-images/alma9-cvmfs tail -f /dev/null
elif [ "${{ matrix.image }}" = "ubuntu22" ]; then
docker run --name container --privileged -v ${GITHUB_WORKSPACE}:/key4hep-spack -v ~/.cache/ccache:/root/.cache/ccache -d ghcr.io/key4hep/key4hep-images/ubuntu22-cvmfs tail -f /dev/null
else
echo "Unknown image"
exit 1
fi

- name: Setup environment and concretize
run: |

cat <<'EOF' > ${GITHUB_WORKSPACE}/script_container.sh
set -e

cd /
ls -lah /
ls -lah /key4hep-spack

git clone https://github.com/spack/spack -q
source spack/share/spack/setup-env.sh
Comment on lines +42 to +43
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be a

      - uses: actions/checkout@v4
        with:
          repo: spack/spack
          path: spack

at the top. Potentially, even ref: $(cat ${GITHUB_WORKSPACE}/.latest-commit) works, but since we need the history of develop as well, we would then also have to tweak the fetch-depth, so I am not sure whether it's worth it to specify that here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I'm not sure. The checkout action seems to do more things and sometimes it takes more than a simple clone.


cd /spack
git checkout $(cat /key4hep-spack/.latest-commit)
source /key4hep-spack/.cherry-pick

if [ "${{ matrix.build_type }}" = "release" ]; then
env=key4hep-release
elif [ "${{ matrix.build_type }}" = "nightly" ]; then
env=key4hep-nightly-opt
pip3 install pyyaml
jmcarcell marked this conversation as resolved.
Show resolved Hide resolved
python3 /key4hep-spack/scripts/fetch_nightly_versions.py --path /key4hep-spack/environments/key4hep-common/packages.yaml --extra-path /key4hep-spack/environments/key4hep-nightly-opt/packages.yaml ""
else
echo "Unknown build type"
exit 1
fi
cd /key4hep-spack/environments/${env}
spack env activate .
spack concretize

EOF

chmod +x ${GITHUB_WORKSPACE}/script_container.sh

# cat ${GITHUB_WORKSPACE}/script_container.sh

docker exec container /bin/bash -c "/mount.sh && /key4hep-spack/script_container.sh"
Loading