fix: resolve 5 open issues

.github/workflows/release.yml

@@ -36,62 +36,130 @@
   # TODO: To be implemented
   # test-job:
   #   uses: ./.github/workflows/ci.yml
-  build-job:
-    # TODO: To be implemented
-    # needs: test-job
+  setup:
     runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
+      - uses: actions/checkout@v5
+      - uses: oven-sh/setup-bun@v1
 
-      - uses: oven-sh/setup-bun@635640504f6d7197d3bb29876a652f671028dc97
-      - run: bun install
+      - name: Download versions.json
+        run: gh release download versions -p versions.json || echo "{}" > versions.json
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Check for new releases of nodejs and bun
-        if: ${{ inputs.nodejs-version == '' && inputs.bun-versions == '' && inputs.distros == '' }}
+      - name: Cleanup unsupported versions
         run: |
-          set -e
-          echo "NODE_VERSIONS_TO_BUILD=$(bun run check-bun-node.ts --node ${{ env.NODE_MAJOR_VERSIONS_TO_CHECK }})" >> $GITHUB_ENV
-          echo "BUN_VERSIONS_TO_BUILD=$(bun run check-bun-node.ts --bun ${{ env.BUN_TAGS_TO_CHECK }})" >> $GITHUB_ENV
+          bun run check-bun-node.ts --cleanup --generate
+          if [[ `git status --porcelain` ]]; then
+            git config --local user.email "github-actions[bot]@users.noreply.github.com"
+            git config --local user.name "github-actions[bot]"
+            git add .
+            git commit -m "chore: cleanup unsupported versions"
+            git push
+          fi
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Generate Matrix
+        id: set-matrix
+        run: |
+          MATRIX=$(bun run check-bun-node.ts --matrix)
+          echo "matrix=$MATRIX" >> $GITHUB_OUTPUT
+        env:
+          BUN_TAGS_TO_CHECK: ${{ env.BUN_TAGS_TO_CHECK }}
+          DISTROS: ${{ env.DISTROS }}
+          NODE_MAJOR_VERSIONS_TO_CHECK: ${{ env.NODE_MAJOR_VERSIONS_TO_CHECK }}
+
+  build:
+    needs: setup
+    runs-on: ubuntu-latest
+    if: ${{ fromJson(needs.setup.outputs.matrix).include[0] }}
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.setup.outputs.matrix) }}
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Download versions.json
+        run: gh release download versions -p versions.json || echo "{}" > versions.json
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
       - uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08
         name: Build and push Docker images
         with:
           timeout_minutes: 120
           max_attempts: 3
           retry_on: error
-          command: ./build_updated.sh
+          command: ./build_single.sh --bun "${{ matrix.bun_version }}" --node "${{ matrix.node_version }}" --distro "${{ matrix.distro }}"
         env:
           REGISTRY: ${{ env.REGISTRY }}
           PLATFORMS: ${{ env.PLATFORMS }}
-          NODE_VERSIONS_TO_BUILD: ${{ env.NODE_VERSIONS_TO_BUILD || inputs.nodejs-version }}
-          BUN_VERSIONS_TO_BUILD: ${{ env.BUN_VERSIONS_TO_BUILD || inputs.bun-versions }}
-          DISTROS: ${{ env.DISTROS || inputs.distros }}
 
-      - name: Commit changes
-        run: ./commit_changes.sh
+      - name: Upload success artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-success-${{ matrix.bun_version }}-${{ matrix.node_version }}-${{ matrix.distro }}
+          path: build_success.json
+
+  update-release:
+    needs: build
+    runs-on: ubuntu-latest
+    if: always() && needs.build.result == 'success'
+    steps:
+      - uses: actions/checkout@v5
+      - uses: oven-sh/setup-bun@v1
+
+      - name: Download versions.json
+        run: gh release download versions -p versions.json || echo "{}" > versions.json
         env:
-          BUN_VERSIONS_TO_BUILD: ${{ env.BUN_VERSIONS_TO_BUILD }}
-          NODE_VERSIONS_TO_BUILD: ${{ env.NODE_VERSIONS_TO_BUILD }}
-          DISTROS: ${{ env.DISTROS }}
-      - name: Pull changes
-        run: git pull -r
-      - name: Push changes
-        uses: ad-m/github-push-action@77c5b412c50b723d2a4fbc6d71fb5723bcd439aa
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          pattern: build-success-*
+          merge-multiple: true
+          path: updates
+
+      - name: Update versions.json
+        run: |
+          # Merge all JSON fragments into versions.json
+          # We iterate over all files in updates/ and merge them using jq
+          # Note: This is a simple merge. If multiple builds update the same key, last one wins (which is fine as they should be identical for the same version).
+
+          for file in updates/*.json; do
+            if [ -f "$file" ]; then
+              # Merge nodejs versions
+              # We need to be careful not to overwrite the whole object if we only have partial updates.
+              # jq's * operator merges objects recursively.
+              jq -s '.[0] * .[1]' versions.json "$file" > versions.json.tmp && mv versions.json.tmp versions.json
+            fi
+          done
+
+          cat versions.json
+
+      - name: Upload versions.json
+        run: |
+          gh release create versions versions.json --title "Versions State" --notes "Stores the current versions.json state" || \
+          gh release upload versions versions.json --clobber
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   rerun-failed-jobs:
     runs-on: ubuntu-latest
-    needs: [build-job]
+    needs: [build]
     if: failure()
     steps:
       - name: Rerun failed jobs in the current workflow

build_single.sh

@@ -0,0 +1,144 @@
+#!/bin/bash
+
+# Exit on error
+set -e
+
+# Logging function
+log() {
+  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')] $@"
+}
+
+# Retry function
+retry() {
+  local retries=${RETRIES:-3}
+  local count=0
+  until "$@"; do
+    exit_code=$?
+    count=$((count + 1))
+    if [ $count -lt $retries ]; then
+      log "Retrying ($count/$retries)..."
+      sleep 5
+    else
+      log "Failed after $count attempts."
+      return $exit_code
+    fi
+  done
+  return 0
+}
+
+# Parse arguments
+while [[ "$#" -gt 0 ]]; do
+  case $1 in
+    --bun) BUN_VERSION="$2"; shift ;;
+    --node) NODE_VERSION="$2"; shift ;;
+    --distro) DISTRO="$2"; shift ;;
+    *) echo "Unknown parameter passed: $1"; exit 1 ;;
+  esac
+  shift
+done
+
+if [ -z "$BUN_VERSION" ] || [ -z "$NODE_VERSION" ] || [ -z "$DISTRO" ]; then
+  echo "Usage: $0 --bun <version> --node <version> --distro <distro>"
+  exit 1
+fi
+
+log "Building image for Bun version $BUN_VERSION, Node version $NODE_VERSION, Distro $DISTRO"
+
+# Read versions.json for codename lookup (optional, but good for tagging)
+# If versions.json is not present, we might miss some tags, but the matrix generation should have ensured we have what we need.
+# Actually, we need versions.json to know the codename (e.g. "Iron") and to check if it's "latest".
+# We can expect versions.json to be present in the working directory (downloaded by workflow).
+
+if [ -f "versions.json" ]; then
+  json_data=$(cat versions.json)
+else
+  json_data="{}"
+fi
+
+REGISTRY=${REGISTRY:-imbios}
+PLATFORMS=${PLATFORMS:-linux/amd64,linux/arm64}
+
+generate_tags() {
+  local bun_version=$1
+  local node_version=$2
+  local distro=$3
+
+  local node_major=${node_version%%.*}
+  local node_minor=${node_version%.*}
+  local bun_major=${bun_version%%.*}
+  local bun_minor=${bun_version%.*}
+
+  local is_canary=false
+  if [[ $bun_version == *"-canary"* ]]; then
+    is_canary=true
+    bun_version="canary"
+  fi
+
+  echo "$REGISTRY/bun-node:${bun_version}-${node_version}-${distro}"
+
+  if [ $is_canary == false ]; then
+    echo "$REGISTRY/bun-node:${bun_minor}-${node_version}-${distro}"
+    echo "$REGISTRY/bun-node:${bun_major}-${node_version}-${distro}"
+    echo "$REGISTRY/bun-node:${bun_version}-${node_minor}-${distro}"
+    echo "$REGISTRY/bun-node:${bun_version}-${node_major}-${distro}"
+  elif [[ $bun_version == "canary" ]]; then
+    echo "$REGISTRY/bun-node:canary-${node_minor}-${distro}"
+    echo "$REGISTRY/bun-node:canary-${node_major}-${distro}"
+  fi
+
+  local codename=$(echo "${json_data}" | jq -r ".nodejs.\"${node_major}\".name")
+  if [ "$codename" != "null" ]; then
+      echo "$REGISTRY/bun-node:${bun_version}-${codename}-${distro}"
+      if [[ $is_canary == false ]]; then
+        echo "$REGISTRY/bun-node:latest-${codename}-${distro}"
+      fi
+  fi
+
+  if [[ $is_canary == false ]]; then
+    echo "$REGISTRY/bun-node:latest-${node_version}-${distro}"
+    echo "$REGISTRY/bun-node:latest-${node_major}-${distro}"
+  fi
+
+  # Latest tag logic
+  # We rely on the caller (workflow) or check versions.json to see if this is the latest Node version.
+  local latest_node_major=$(echo "${json_data}" | jq -r '.nodejs | keys | map(tonumber) | max')
+
+  if [[ $is_canary == false && "$node_major" == "$latest_node_major" && $distro == "debian" ]]; then
+    echo "$REGISTRY/bun-node:latest"
+  fi
+
+  if [[ $is_canary == false ]]; then
+    echo "$REGISTRY/bun-node:${node_major}-${distro}"
+  fi
+}
+
+tag_distro=$DISTRO
+if [ "$DISTRO" == "debian-slim" ]; then
+  tag_distro="slim"
+fi
+
+tags=($(generate_tags "$BUN_VERSION" "$NODE_VERSION" "$tag_distro"))
+image_name="$REGISTRY/bun-node:${BUN_VERSION}-${NODE_VERSION}-${tag_distro}"
+
+node_major=${NODE_VERSION%%.*}
+
+for tag in "${tags[@]}"; do
+  log "Tagging $image_name as $tag"
+  retry docker buildx build --sbom=true --provenance=true --platform "$PLATFORMS" -t "$image_name" -t "$tag" "./src/base/${node_major}/${DISTRO}" --push --provenance=mode=max
+
+  if [ "$DISTRO" == "alpine" ]; then
+    log "Building and Tagging Alpine image with Git"
+    retry docker buildx build --sbom=true --provenance=true --platform "$PLATFORMS" -t "$image_name-git" -t "$tag-git" "./src/git/${node_major}/${DISTRO}" --push --provenance=mode=max
+  fi
+done
+
+# Output success JSON fragment for aggregation
+# We need to update versions.json with the new versions.
+# We output a JSON file that the workflow can pick up.
+bun_tag="latest"
+if [[ $BUN_VERSION == *"-canary"* ]]; then
+  bun_tag="canary"
+fi
+
+# Create a partial JSON update
+echo "{\"nodejs\": {\"$node_major\": {\"version\": \"v$NODE_VERSION\"}}, \"bun\": {\"$bun_tag\": \"v$BUN_VERSION\"}}" > build_success.json