Refactor GitHub Actions workflow for improved clarity and functionality

Author: rbeucher

.github/workflows/cd.yml

@@ -7,89 +7,102 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version to update to (e.g. 2.3.0a9)'
+        description: 'Version to publish (e.g. 2.3.0a9)'
         required: false
         type: string
 
 jobs:
   pypi:
-    name: build and deploy to PyPI
+    name: Build & Deploy to PyPI
     runs-on: ubuntu-latest
     permissions:
       id-token: write
+
     steps:
-      - name: Checkout source
-        uses: actions/checkout@v5.0.0
-      - name: Set up Python 3.11
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: 3.11
-      - name: Install build dependencies
-        run: python -m pip install build twine
+          python-version: '3.11'
+
+      - name: Install build tooling
+        run: python -m pip install --upgrade pip build twine
+
       - name: Build distributions
-        shell: bash -l {0}
         run: |
           git clean -xdf
           python -m build
-      - name: Publish package to PyPI
+
+      - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           skip-existing: true
 
   conda:
-    name: build and deploy to conda
+    name: Build & Deploy to Conda
     needs: pypi
     runs-on: ubuntu-latest
+    env:
+      PACKAGE: access_moppy
+
     steps:
-      - name: Checkout source
-        uses: actions/checkout@v5.0.0
-      - name: Wait for PyPI propagation
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Derive Version
+        id: ver
         run: |
-          echo "Waiting for PyPI package to be downloadable..."
-          PACKAGE_NAME="access_moppy"
-          TAG="${GITHUB_REF_NAME}"
-          VERSION="${TAG#moppy-}"
-          VERSION="${VERSION#v}"
-          echo "Looking for package: ${PACKAGE_NAME}==${VERSION}"
-          for i in {1..90}; do
-            echo "Attempt $i/90: Trying to download wheel and sdist..."
-            rm -rf /tmp/pypi_check_download && mkdir -p /tmp/pypi_check_download
-            pip download --no-deps --dest /tmp/pypi_check_download ${PACKAGE_NAME}==${VERSION} >/dev/null 2>&1
-            pip download --no-deps --no-binary=:all: --dest /tmp/pypi_check_download ${PACKAGE_NAME}==${VERSION} >/dev/null 2>&1
-            WHEEL=$(ls /tmp/pypi_check_download/*.whl 2>/dev/null | head -1)
-            SDIST=$(ls /tmp/pypi_check_download/*.tar.gz 2>/dev/null | head -1)
-            if [[ -n "$WHEEL" && -n "$SDIST" ]]; then
-              echo "✅ Both wheel and sdist for ${PACKAGE_NAME}==${VERSION} are downloadable!"
-              break
-            fi
-            if [ $i -eq 90 ]; then
-              echo "❌ Could not download both wheel and sdist after 15 minutes"
-              echo "Available files:"
-              ls -l /tmp/pypi_check_download || echo "No files downloaded"
-              exit 1
+          tag="${GITHUB_REF_NAME}"
+          ver="${tag#moppy-}"
+          ver="${ver#v}"
+          echo "version=$ver" >> $GITHUB_OUTPUT
+
+      - name: Wait for PyPI availability (fast check)
+        env:
+          VER: ${{ steps.ver.outputs.version }}
+        run: |
+          echo "Checking PyPI for $PACKAGE==$VER..."
+          for i in {1..60}; do
+            if curl -sf https://pypi.org/pypi/$PACKAGE/$VER/json > /dev/null; then
+              echo "🟢 Found $PACKAGE==$VER on PyPI"
+              exit 0
             fi
-            echo "Files not yet downloadable, waiting 10 seconds..."
+            echo "Waiting... $i/60"
             sleep 10
           done
-      - name: Setup conda environment
+          echo "❌ Timeout waiting for $PACKAGE==$VER on PyPI"
+          exit 1
+
+      - name: Setup conda
         uses: conda-incubator/setup-miniconda@v3
         with:
           auto-activate-base: true
           channels: conda-forge
-      - name: Install conda build tools
-        run: |
-          conda install -y conda-build anaconda-client
-      - name: Build and upload the conda package
-        uses: ACCESS-NRI/action-build-and-upload-conda-packages@d97711bc4445ba5c4de55f5a1bccbd4815286289
+
+      - name: Cache conda build
+        uses: actions/cache@v4
+        with:
+          path: ~/.conda-build
+          key: conda-bld-${{ runner.os }}
+          restore-keys: |
+            conda-bld-
+
+      - name: Install conda build tooling
+        run: conda install -y conda-build anaconda-client
+
+      - name: Build & Upload to Conda
+        uses: ACCESS-NRI/action-build-and-upload-conda-packages@main
         with:
           meta_yaml_dir: .conda
           upload: true
           user: accessnri
           label: main
-          token: ${{ secrets.anaconda_token }}
+          token: ${{ secrets.ANACONDA_TOKEN }}
 
   update_analysis3:
-    name: Update ACCESS-MOPPy on Analysis3 Conda Environment
+    name: Update access-moppy in Analysis3
     needs: conda
     runs-on: ubuntu-latest
     permissions:
@@ -101,9 +114,9 @@ jobs:
       FILE_PATH: environments/analysis3/environment.yml
       PACKAGE: access-moppy
       CHANNEL: accessnri
-      RELEASE_TAG: ${{ github.ref_name }}
-      INPUT_VERSION: ${{ github.event.inputs.version }}
       GH_TOKEN: ${{ secrets.GH_ANALYSIS3_DEPLOY }}
+      INPUT_VERSION: ${{ github.event.inputs.version }}
+      RELEASE_TAG: ${{ github.ref_name }}
     steps:
       - name: Derive version string
         id: ver