diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3598e691..847066473 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,10 +51,8 @@ jobs: uses: ./.github/workflows/container.yml outputs: - # Output regeneration temporarily disabled — remove the `false` line below to re-enable. if: | - false - && !cancelled() + !cancelled() && contains(needs.*.result, 'success') && !contains(needs.*.result, 'failure') && (needs.changes.outputs.outputs == 'true' diff --git a/.github/workflows/outputs.yml b/.github/workflows/outputs.yml index 716c520ae..3a6f0b508 100644 --- a/.github/workflows/outputs.yml +++ b/.github/workflows/outputs.yml @@ -43,7 +43,7 @@ jobs: - name: Re-generate outputs from tutorial scripts run: | chmod -R a+w outputs - mkdir spack-home && sudo chown -R 1000:1000 spack-home + mkdir spack-home && sudo chmod -R a+rwx spack-home DOCKER_RUN_OPTS="-e COLUMNS=94 -e COLIFY_SIZE=24x94 -v $(pwd)/spack-home:/home/spack" make -C outputs -j $(nproc) DOCKER_RUN_OPTS="$DOCKER_RUN_OPTS" container=ghcr.io/spack/tutorial @@ -51,11 +51,11 @@ jobs: run: | git diff HEAD outputs/ - - name: Push modified files to branch - if: ( github.event_name == 'pull_request' && ! github.event.pull_request.head.repo.fork ) - run: | - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git add outputs/ - git commit -m "Update generated outputs on behalf of [@${{ github.actor }}]" - git push + # - name: Push modified files to branch + # if: ( github.event_name == 'pull_request' && ! github.event.pull_request.head.repo.fork ) + # run: | + # git config user.name "github-actions[bot]" + # git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + # git add outputs/ + # git commit -m "Update generated outputs on behalf of [@${{ github.actor }}]" + # git push diff --git a/container/Dockerfile b/container/Dockerfile index 28f870265..939678773 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/spack/tutorial-ubuntu-22.04 +FROM ghcr.io/spack/tutorial-ubuntu-26.04 ENV DEBIAN_FRONTEND=noninteractive @@ -13,12 +13,9 @@ RUN apt-get update -y && \ vim \ rclone -# Remove GCC 12 from container -RUN apt-get remove -y gcc-12 - # Download the buildcache RUN mkdir /mirror -RUN rclone copy :s3:spack-binaries/v2025.11.0/tutorial /mirror +RUN rclone copy :s3:spack-binaries/releases/v2026.06/tutorial /mirror RUN chmod -R go+r /mirror diff --git a/outputs/basics.sh b/outputs/basics.sh index a4791c768..63aff41cb 100755 --- a/outputs/basics.sh +++ b/outputs/basics.sh @@ -32,8 +32,8 @@ example --tee basics/gmake "spack install gmake" example basics/compiler-list "spack compilers" -example basics/mirror "spack mirror add --unsigned tutorial /mirror" -#example basics/mirror "spack buildcache keys --install --trust" +example basics/mirror "spack mirror add tutorial /mirror" +example basics/mirror "spack buildcache keys --install --trust --yes-to-all" # The Spec Syntax example basics/versions-zlib "spack versions zlib-ng" diff --git a/outputs/defs.sh b/outputs/defs.sh index 84b1cf02e..2e1eff396 100755 --- a/outputs/defs.sh +++ b/outputs/defs.sh @@ -15,7 +15,7 @@ raw_outputs="${PROJECT}/raw" # used by scripts tutorial_branch=releases/v1.2 -packages_release=v2025.11.0 +packages_release=releases/v2026.06 print_status() { printf "\n%b: %s\n\n" "\033[1;35m$1\033[0m" "$2"