ci: fix outputs generation for v0.23.1

.github/workflows/ci.yml

@@ -50,15 +50,17 @@ jobs:
     needs: changes
     uses: ./.github/workflows/container.yml
 
-  # outputs:
-  #   if: |
-  #     !cancelled()
-  #     && contains(needs.*.result, 'success')
-  #     && !contains(needs.*.result, 'failure')
-  #     && (needs.changes.outputs.outputs == 'true'
-  #     || startsWith(github.ref, 'refs/tags/'))
-  #   needs: [ changes, container ]
-  #   uses: ./.github/workflows/outputs.yml
+  outputs:
+    if: |
+      !cancelled()
+      && contains(needs.*.result, 'success')
+      && !contains(needs.*.result, 'failure')
+      && (needs.changes.outputs.outputs == 'true'
+      || startsWith(github.ref, 'refs/tags/'))
+    needs: [ changes, container ]
+    uses: ./.github/workflows/outputs.yml
+    with:
+      with_pr_container: ${{ needs.container.result == 'success' }}
 
   style:
     if: ${{ needs.changes.outputs.style == 'true' }}

.github/workflows/container.yml

@@ -10,21 +10,6 @@ jobs:
       packages: write
 
     steps:
-      - name: Remove pre-installed apps to make space for build
-        run: |
-          sudo apt-get remove -y '^llvm-.*'
-          sudo apt-get remove -y '^dotnet-.*'
-          sudo apt-get remove -y 'php.*'
-          sudo apt-get remove -y '^mongodb-.*'
-          sudo apt-get remove -y '^mysql-.*'
-          sudo apt-get autoremove -y
-          sudo apt-get clean
-          sudo rm -rf /usr/share/dotnet/
-          sudo rm -rf /usr/local/share/powershell
-          sudo rm -rf /usr/local/share/chromium
-          sudo rm -rf /usr/local/lib/android
-          sudo rm -rf /usr/local/lib/node_modules
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf
 

.github/workflows/outputs.yml

@@ -1,6 +1,10 @@
 name: Generate outputs
 on:
   workflow_call:
+    inputs:
+      with_pr_container:
+        required: true
+        type: boolean
 
 jobs:
   re-generate:
@@ -10,22 +14,6 @@ jobs:
       contents: write
 
     steps:
-    - name: Remove pre-installed apps to make space for build
-      run: |
-        sudo apt-get remove -y '^llvm-.*'
-        sudo apt-get remove -y '^dotnet-.*'
-        sudo apt-get remove -y 'php.*'
-        sudo apt-get remove -y '^mongodb-.*'
-        sudo apt-get remove -y '^mysql-.*'
-        sudo apt-get autoremove -y
-        sudo apt-get clean
-        sudo rm -rf /usr/share/dotnet/
-        sudo rm -rf /usr/local/share/powershell
-        sudo rm -rf /usr/local/share/chromium
-        sudo rm -rf /usr/local/lib/android
-        sudo rm -rf /usr/local/lib/node_modules
-        sudo docker system prune -af
-
     - name: Checkout (Push)
       if: github.event_name != 'pull_request'
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
@@ -40,14 +28,14 @@ jobs:
         repository: ${{ github.event.pull_request.head.repo.full_name }}
 
     - name: Download container from artifact if PR
-      if: github.event_name == 'pull_request' && needs.container.result == 'success'
+      if: github.event_name == 'pull_request' && inputs.with_pr_container
       uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
       with:
         name: tutorial-container
         path: /tmp
 
     - name: Import container from PR artifact
-      if: github.event_name == 'pull_request' && needs.container.result == 'success'
+      if: github.event_name == 'pull_request' && inputs.with_pr_container
       run: |
         docker load --input /tmp/tutorial-container.tar
         docker image ls -a

container/Dockerfile

@@ -1,23 +1,22 @@
-FROM ghcr.io/spack/tutorial-ubuntu-22.04:v2024-05-07
+FROM ghcr.io/spack/tutorial-ubuntu-22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Install AWS cli
 RUN apt-get update -y && \
     apt-get install -y --no-install-recommends \
-    awscli \
     bash-completion \
+    ca-certificates \
     emacs \
     jq \
     less \
-    vim
+    rclone \
+    vim \
+    && rm -rf /var/lib/apt/lists/*
 
-# Remove GCC 12 from container
-RUN apt-get remove -y gcc-12
 
 # Download the buildcache
 RUN mkdir /mirror
-RUN aws --region us-east-1 --no-sign-request s3 sync --only-show-errors s3://spack-binaries/releases/v0.23/tutorial /mirror
+RUN rclone copy :s3:spack-binaries/v0.23.1/tutorial /mirror
 
 RUN chmod -R go+r /mirror
 

outputs/Makefile

@@ -25,7 +25,7 @@ sections := environments
 run_targets := $(addprefix run-,$(sections))
 
 # Entrypoint
-update-outputs: #run
+update-outputs: run
 	echo "Filtering raw outputs though col"
 	for raw in raw/*/*.out; do \
 		out=$$(echo $$raw | sed 's.raw/..'); \

outputs/modules.sh

@@ -120,8 +120,8 @@ example --tee modules/lmod-intro-conflict  "module list"
 cp "$PROJECT/module-configs/lmod.1.yaml" ~/.spack/modules.yaml
 example      modules/lmod-refresh-1     "spack module lmod refresh --delete-tree -y"
 module purge
-module unuse "$HOME/spack/share/spack/modules/linux-ubuntu22.04-x86_64_v3"
-module use "$HOME/spack/share/spack/lmod/linux-ubuntu22.04-x86_64/Core"
+module unuse "$HOME/spack/share/spack/modules/*"
+module use "$HOME/spack/share/spack/lmod/*/Core"
 example --tee modules/module-avail-6     "module avail"
 
 

outputs/packaging.sh

@@ -21,7 +21,7 @@ example packaging/checksum-mpileaks-1  "spack checksum tutorial-mpileaks 1.0"
 example --expect-error packaging/install-mpileaks-1  "spack install tutorial-mpileaks"
 
 cp "$PROJECT/package-py-files/1.package.py" "$mpileaks_package_py"
-example packaging/info-mpileaks       "spack info tutorial-mpileaks"
+#example packaging/info-mpileaks       "spack info tutorial-mpileaks"
 
 cp "$PROJECT/package-py-files/2.package.py" "$mpileaks_package_py"
 example --expect-error packaging/install-mpileaks-2  "spack install tutorial-mpileaks"

outputs/stacks.sh

@@ -91,7 +91,7 @@ example --tee stacks/modules-1 "module --version"
 
 cat "$project/stacks/examples/8.spack.stack.yaml" > ~/stacks/spack.yaml
 spack module lmod refresh -y
-module use "$HOME/stacks/modules/linux-ubuntu22.04-x86_64/Core"
+module use ~/stacks/modules/*/Core
 
 example --tee stacks/modules-2 "module av"
 

outputs/stacks/compiler-find-0.out

@@ -1,5 +1,5 @@
 $ spack compiler find "$(spack location -i gcc)"
-==> Added 1 new compiler to /home/spack5/stacks/spack.yaml
+==> Added 1 new compiler to /home/spack/stacks/spack.yaml
     gcc@12.3.0
 ==> Compilers are defined in the following files:
-    /home/spack5/.spack/linux/compilers.yaml  /home/spack5/stacks/spack.yaml
+    /home/spack/.spack/linux/compilers.yaml  /home/spack/stacks/spack.yaml

outputs/stacks/compiler-find-1.out

@@ -1,2 +1,2 @@
 $ spack location -i gcc
-/home/spack5/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/gcc-12.3.0-jjgfqpdmihb2cq5ca7txia5oshruq56q
+/home/spack/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/gcc-12.3.0-jjgfqpdmihb2cq5ca7txia5oshruq56q

outputs/stacks/compiler-list-0.out

@@ -1,7 +1,7 @@
 $ spack compiler list
 ==> Available compilers
--- clang ubuntu22.04-x86_64 -------------------------------------
-clang@14.0.0
+-- clang ubuntu24.04-x86_64 -------------------------------------
+clang@18.1.3
 
--- gcc ubuntu22.04-x86_64 ---------------------------------------
-gcc@12.3.0  gcc@11.4.0	gcc@10.5.0
+-- gcc ubuntu24.04-x86_64 ---------------------------------------
+gcc@13.3.0  gcc@12.3.0	gcc@10.5.0