From 680a16e428a8ce4a2b68c420705b43c237fc59f1 Mon Sep 17 00:00:00 2001
From: Marcel Bargull <marcel.bargull@udo.edu>
Date: Sun, 2 Jun 2024 20:34:53 +0200
Subject: [PATCH] create-env: Rebuild with newer buildah, base, deps

Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
---
 .github/workflows/create-env.yaml | 32 +++++++++++++++++++++++++++----
 images/create-env/Dockerfile.test |  2 +-
 images/create-env/install-conda   |  9 +++++----
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/create-env.yaml b/.github/workflows/create-env.yaml
index 21162b41..43d1b5d0 100644
--- a/.github/workflows/create-env.yaml
+++ b/.github/workflows/create-env.yaml
@@ -14,7 +14,11 @@ on:
 jobs:
   build:
     name: Build & Push
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
+    container:
+      # travier/podman-action contains newer podman/buildah versions.
+      image: quay.io/travier/podman-action
+      options: --privileged
     env:
       MAJOR_VERSION: 3
       MINOR_VERSION: 0
@@ -24,9 +28,29 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-      with:
-        platforms: arm64
+      run: |
+        podman run --rm --privileged \
+          docker.io/tonistiigi/binfmt --install arm64
+
+    - name: Install Tools
+      run: |
+        set -eu
+        # jq is not installed in travier/podman-action
+        dnf install -qy \
+          jq
+        rpm -q \
+          buildah podman \
+          coreutils findutils sed \
+          curl jq \
+          | (
+            while read -r line ; do
+              printf %s\\n "${line}"
+              case "${line}" in (*' not installed'*)
+                err=1 ;;
+              esac
+              done
+              exit "${err-0}"
+          )
 
     - name: Prepare
       id: prepare
diff --git a/images/create-env/Dockerfile.test b/images/create-env/Dockerfile.test
index 9c2566ae..1969a2db 100644
--- a/images/create-env/Dockerfile.test
+++ b/images/create-env/Dockerfile.test
@@ -69,7 +69,7 @@ COPY --from=build_conda /opt/conda /opt/conda
 COPY --from=build_conda /opt/conda/env-activate.sh /usr/local/
 RUN set -x && \
     /usr/local/env-execute \
-      conda info --all \
+      conda info --verbose \
     && \
     { set -x && . /usr/local/env-activate.sh && set +x ; } \
     && \
diff --git a/images/create-env/install-conda b/images/create-env/install-conda
index a3b9b332..c65d3aec 100755
--- a/images/create-env/install-conda
+++ b/images/create-env/install-conda
@@ -29,16 +29,16 @@ miniconda_boostrap_prefix="$( pwd )/miniconda"
   # Only need `strip` executable from binutils. Other binaries from the package
   # and especially the "sysroot" dependency is only bloat for this container
   # image. (NOTE: The binary needs libgcc-ng which is explicitly added later.)
-  mamba create --yes \
+  conda create --yes \
     --prefix="${conda_install_prefix}" \
     --channel=conda-forge \
     binutils
   cp -aL "${conda_install_prefix}/bin/strip" ./strip
   conda run --prefix="${conda_install_prefix}" strip -- ./strip
-  mamba remove --yes --all \
+  conda remove --yes --all \
     --prefix="${conda_install_prefix}"
 
-  mamba create --yes \
+  conda create --yes \
     --prefix="${conda_install_prefix}" \
     --channel=conda-forge \
     \
@@ -115,7 +115,8 @@ conda config \
 # NB: Running conda after the .pyc removal will recreate some .pyc files.
 #     This is intentional as it speeds up conda startup time.
 conda list --name=base
-conda info --all
+conda info --verbose
+conda --version
 mamba --version
 # Make sure we have the requested conda, mamba versions installed.
 conda list \