Merge pull request #168 from svc-design/codex/replace-long-run-sections-with-external-script-6r98n0

Refactor workflow runs to external scripts
2025-10-02 20:48:14 +08:00 · 2025-10-02 20:48:14 +08:00 · 95b2ea8362
commit 95b2ea8362
parent 6153128c5c 8c17aeed82
6 changed files with 128 additions and 92 deletions
--- a/.github/workflows/offline-package-argocd-installer.yaml
+++ b/.github/workflows/offline-package-argocd-installer.yaml
@ -53,14 +53,7 @@ jobs:
        id: resolve
        env:
          OVERRIDE_CHART_VERSION: ${{ github.event.inputs.chart_version }}
-        run: |
-          set -euo pipefail
-          if [ -n "${OVERRIDE_CHART_VERSION}" ]; then
-            CHART_VERSION="${OVERRIDE_CHART_VERSION}"
-          else
-            CHART_VERSION=$(helm search repo argo/argo-cd --versions | awk 'NR==2{print $2}')
-          fi
-          echo "chart_version=${CHART_VERSION}" >> "$GITHUB_OUTPUT"
+        run: bash scripts/offline-argocd/resolve_chart_version.sh

      - name: Prepare directories
        run: |
@ -71,45 +64,7 @@ jobs:
      - name: Stage installer script
        env:
          CHART_VERSION: ${{ steps.resolve.outputs.chart_version }}
-        run: |
-          set -euo pipefail
-          cat <<'SCRIPT' > argocd-offline-package/scripts/install-argocd.sh
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-CHART_DIR="${ROOT_DIR}/charts/argo-cd"
-IMAGES_DIR="${ROOT_DIR}/images"
-RELEASE_NAME="${RELEASE_NAME:-argo-cd}"
-NAMESPACE="${NAMESPACE:-argocd}"
-
-if command -v nerdctl >/dev/null 2>&1; then
-  LOADER="nerdctl"
-elif command -v docker >/dev/null 2>&1; then
-  LOADER="docker"
-else
-  echo "Either docker or nerdctl is required to load images." >&2
-  exit 1
-fi
-
-for tar in "${IMAGES_DIR}"/*.tar; do
-  [ -f "$tar" ] || continue
-  echo "Loading image: $tar"
-  "$LOADER" load -i "$tar"
-done
-
-echo "Installing/Upgrading Argo CD release ${RELEASE_NAME} in namespace ${NAMESPACE}"
-helm upgrade --install "${RELEASE_NAME}" "${CHART_DIR}" \
-  --namespace "${NAMESPACE}" \
-  --create-namespace \
-  "$@"
-SCRIPT
-          chmod +x argocd-offline-package/scripts/install-argocd.sh
-          cat <<EOFMETA > argocd-offline-package/metadata/INFO
-chart: argo/argo-cd
-chart_version: ${CHART_VERSION}
-created_at: $(date -u +%Y-%m-%dT%H:%M:%SZ)
-EOFMETA
+        run: bash scripts/offline-argocd/stage_installer.sh

      - name: Download nerdctl binary for ${{ matrix.arch }}
        run: |
@ -120,25 +75,8 @@ EOFMETA
      - name: Pull & export required images
        env:
          CHART_VERSION: ${{ steps.resolve.outputs.chart_version }}
-        run: |
-          set -euo pipefail
-          PLATFORM="linux/${{ matrix.arch }}"
-          helm template argo argo/argo-cd --version "${CHART_VERSION}" > manifest.yaml
-          mapfile -t images < <(grep -oP 'image:\s*"?\K([^"\s]+)' manifest.yaml | sort -u || true)
-          rm -f manifest.yaml
-          for img in "${images[@]}"; do
-            [ -n "$img" ] || continue
-            if [[ "$img" == *"{{"* ]]; then
-              continue
-            fi
-            echo "Pulling $img for ${PLATFORM}"
-            if ! docker pull --platform "${PLATFORM}" "$img"; then
-              echo "::warning::Failed to pull $img for ${PLATFORM}, skipping" >&2
-              continue
-            fi
-            safe=$(echo "$img" | tr '/:' '-_')
-            docker save "$img" -o "argocd-offline-package/images/${safe}.tar"
-          done
+          MATRIX_ARCH: ${{ matrix.arch }}
+        run: bash scripts/offline-argocd/pull_and_export_images.sh

      - name: Download Helm chart
        env:
@ -238,15 +176,7 @@ EOFMETA
          ssh-keyscan -H "$VPS_HOST" >> ~/.ssh/known_hosts

      - name: Rsync release assets to remote
-        run: |
-          set -euo pipefail
-          REMOTE_DIR="${REMOTE_ROOT}/${TAG_NAME}"
-          ssh -i ~/.ssh/id_rsa "${RSYNC_SSH_USER}@${VPS_HOST}" "mkdir -p '${REMOTE_DIR}'"
-          echo "Rsync -> ${VPS_HOST}:${REMOTE_DIR}/"
-          rsync -av -e "ssh -i ~/.ssh/id_rsa" \
-            release-artifacts/amd64/offline-package-argocd-amd64.tar.gz \
-            release-artifacts/arm64/offline-package-argocd-arm64.tar.gz \
-            "${RSYNC_SSH_USER}@${VPS_HOST}:${REMOTE_DIR}/"
+        run: bash scripts/offline-argocd/rsync_release_assets.sh

  retention:
    name: Remote retention (keep latest 3)
@ -267,20 +197,4 @@ EOFMETA
          ssh-keyscan -H "$VPS_HOST" >> ~/.ssh/known_hosts

      - name: Prune old versions on remote (keep 3)
-        run: |
-          set -euo pipefail
-          ssh -i ~/.ssh/id_rsa "${RSYNC_SSH_USER}@${VPS_HOST}" bash -lc '
-            set -euo pipefail
-            cd "'"${REMOTE_ROOT}"'" || exit 0
-            keep=3
-            mapfile -t all < <(ls -1 | grep -E "^(offline-argocd-|v[0-9]+\.)" | sort -V -r || true)
-            if [ "${#all[@]}" -le "$keep" ]; then
-              echo "Nothing to prune. Count=${#all[@]}"
-              exit 0
-            fi
-            to_delete=("${all[@]:keep}")
-            echo "Pruning old versions: ${to_delete[*]}"
-            for d in "${to_delete[@]}"; do
-              rm -rf -- "$d"
-            done
-          '
+        run: bash scripts/offline-argocd/prune_remote_versions.sh
--- a/scripts/offline-argocd/prune_remote_versions.sh
+++ b/scripts/offline-argocd/prune_remote_versions.sh
@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SSH_USER="${RSYNC_SSH_USER:?RSYNC_SSH_USER environment variable is required}"
+HOST="${VPS_HOST:?VPS_HOST environment variable is required}"
+REMOTE_ROOT="${REMOTE_ROOT:?REMOTE_ROOT environment variable is required}"
+
+ssh -i ~/.ssh/id_rsa "${SSH_USER}@${HOST}" REMOTE_ROOT="${REMOTE_ROOT}" 'bash -s' <<'EOS'
+set -euo pipefail
+cd "${REMOTE_ROOT}" || exit 0
+keep=3
+mapfile -t all < <(ls -1 | grep -E "^(offline-argocd-|v[0-9]+\.)" | sort -V -r || true)
+if [ "${#all[@]}" -le "$keep" ]; then
+  echo "Nothing to prune. Count=${#all[@]}"
+  exit 0
+fi
+to_delete=("${all[@]:keep}")
+echo "Pruning old versions: ${to_delete[*]}"
+for d in "${to_delete[@]}"; do
+  rm -rf -- "$d"
+done
+EOS
--- a/scripts/offline-argocd/pull_and_export_images.sh
+++ b/scripts/offline-argocd/pull_and_export_images.sh
@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+CHART_VERSION="${CHART_VERSION:?CHART_VERSION environment variable is required}"
+MATRIX_ARCH="${MATRIX_ARCH:?MATRIX_ARCH environment variable is required}"
+
+PLATFORM="linux/${MATRIX_ARCH}"
+
+temp_manifest=$(mktemp)
+trap 'rm -f "${temp_manifest}"' EXIT
+
+helm template argo argo/argo-cd --version "${CHART_VERSION}" > "${temp_manifest}"
+mapfile -t images < <(grep -oP 'image:\s*"?\K([^"\s]+)' "${temp_manifest}" | sort -u || true)
+
+for img in "${images[@]}"; do
+  [ -n "$img" ] || continue
+  if [[ "$img" == *"{{"* ]]; then
+    continue
+  fi
+  echo "Pulling $img for ${PLATFORM}"
+  if ! docker pull --platform "${PLATFORM}" "$img"; then
+    echo "::warning::Failed to pull $img for ${PLATFORM}, skipping" >&2
+    continue
+  fi
+  safe=$(echo "$img" | tr '/:' '-_')
+  docker save "$img" -o "argocd-offline-package/images/${safe}.tar"
+done
--- a/scripts/offline-argocd/resolve_chart_version.sh
+++ b/scripts/offline-argocd/resolve_chart_version.sh
@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+OVERRIDE_CHART_VERSION="${OVERRIDE_CHART_VERSION:-}"
+if [[ -n "${OVERRIDE_CHART_VERSION}" ]]; then
+  CHART_VERSION="${OVERRIDE_CHART_VERSION}"
+else
+  CHART_VERSION=$(helm search repo argo/argo-cd --versions | awk 'NR==2{print $2}')
+fi
+
+if [[ -z "${GITHUB_OUTPUT:-}" ]]; then
+  echo "GITHUB_OUTPUT environment variable is not set" >&2
+  exit 1
+fi
+
+echo "chart_version=${CHART_VERSION}" >> "${GITHUB_OUTPUT}"
--- a/scripts/offline-argocd/rsync_release_assets.sh
+++ b/scripts/offline-argocd/rsync_release_assets.sh
@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+REMOTE_DIR="${REMOTE_ROOT:?REMOTE_ROOT environment variable is required}/${TAG_NAME:?TAG_NAME environment variable is required}"
+SSH_USER="${RSYNC_SSH_USER:?RSYNC_SSH_USER environment variable is required}"
+HOST="${VPS_HOST:?VPS_HOST environment variable is required}"
+
+ssh -i ~/.ssh/id_rsa "${SSH_USER}@${HOST}" "mkdir -p '${REMOTE_DIR}'"
+echo "Rsync -> ${HOST}:${REMOTE_DIR}/"
+rsync -av -e "ssh -i ~/.ssh/id_rsa" \
+  release-artifacts/amd64/offline-package-argocd-amd64.tar.gz \
+  release-artifacts/arm64/offline-package-argocd-arm64.tar.gz \
+  "${SSH_USER}@${HOST}:${REMOTE_DIR}/"
--- a/scripts/offline-argocd/stage_installer.sh
+++ b/scripts/offline-argocd/stage_installer.sh
@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+CHART_VERSION="${CHART_VERSION:?CHART_VERSION environment variable is required}"
+
+cat <<'SCRIPT' > argocd-offline-package/scripts/install-argocd.sh
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+CHART_DIR="${ROOT_DIR}/charts/argo-cd"
+IMAGES_DIR="${ROOT_DIR}/images"
+RELEASE_NAME="${RELEASE_NAME:-argo-cd}"
+NAMESPACE="${NAMESPACE:-argocd}"
+
+if command -v nerdctl >/dev/null 2>&1; then
+  LOADER="nerdctl"
+elif command -v docker >/dev/null 2>&1; then
+  LOADER="docker"
+else
+  echo "Either docker or nerdctl is required to load images." >&2
+  exit 1
+fi
+
+for tar in "${IMAGES_DIR}"/*.tar; do
+  [ -f "$tar" ] || continue
+  echo "Loading image: $tar"
+  "$LOADER" load -i "$tar"
+done
+
+echo "Installing/Upgrading Argo CD release ${RELEASE_NAME} in namespace ${NAMESPACE}"
+helm upgrade --install "${RELEASE_NAME}" "${CHART_DIR}" \
+  --namespace "${NAMESPACE}" \
+  --create-namespace \
+  "$@"
+SCRIPT
+
+chmod +x argocd-offline-package/scripts/install-argocd.sh
+
+cat <<EOFMETA > argocd-offline-package/metadata/INFO
+chart: argo/argo-cd
+chart_version: ${CHART_VERSION}
+created_at: $(date -u +%Y-%m-%dT%H:%M:%SZ)
+EOFMETA