feat(wine): build ARM64 images

Author: Greelan

.github/workflows/wine.yml

@@ -63,7 +63,7 @@ jobs:
         with:
           context: .
           file: ./wine/common/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64/v8
           push: true
           pull: true
           tags: ghcr.io/cubecoders/amp:wine-common
@@ -101,7 +101,7 @@ jobs:
         with:
           context: .
           file: ./wine/${{ matrix.version }}/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64/v8
           push: true
           pull: true
           tags: ghcr.io/cubecoders/amp:wine-${{ matrix.version }}

scripts/wine/map-x86-deps-to-arm.sh

@@ -1,58 +1,53 @@
-#!/bin/sh
+#!/bin/bash
 
 set -eu
 
-NATIVE="${NATIVE:-arm64}"
-COMPAT="${COMPAT:-armhf}"
-
-# Make sure indexes for both arches exist for availability checks
-dpkg --add-architecture "${COMPAT}" >/dev/null 2>&1 || true
-apt-get -q -o Acquire::Languages=none update >/dev/null
-
-# Helper dedupe
-seen="$(mktemp)"; trap 'rm -f "$seen"' INT TERM EXIT
-emit() {
-  s=$1
-  if ! grep -Fxq "$s" "${seen}" 2>/dev/null; then
-    printf '%s\n' "${s}"
-    printf '%s\n' "${s}" >>"${seen}"
-  fi
-}
-
-has_candidate() {
-  # $1 = token ("pkg" or "pkg:arch"); returns 0 if APT has a candidate
-  cand=$(
-    apt-cache policy "$1" 2>/dev/null \
-      | sed -n 's/^[[:space:]]\{1,\}Candidate: //p' | head -1
-  )
-  [ -n "${cand:-}" ] && [ "${cand}" != "(none)" ]
-}
-
-# Read each line as a token "pkg[:arch]"
-while IFS= read -r tok; do
-  # trim whitespace and CR
-  tok=${tok%$'\r'}
-  tok=$(printf '%s' "${tok}" | sed 's/^[[:space:]]\+//; s/[[:space:]]\+$//')
-  [ -z "${tok}" ] && continue
-  case "${tok}" in \#*) continue ;; esac
-
-  pkg=${tok%%:*}
-  if [ "${pkg}" = "${tok}" ]; then
-    suf=""
-  else
-    suf=${tok#*:}
-  fi
-
-  # no suffix/amd64 => arm64 ; i386 => armhf ; other arches => skip
-  case "${suf}" in
-    ""|"amd64") tgt="${NATIVE}" ;;
-    "i386")     tgt="${COMPAT}" ;;
-    *)          continue      ;;
-  esac
-
-  if has_candidate "${pkg}:${tgt}"; then
-    emit "${pkg}:${tgt}"
-  elif has_candidate "${pkg}"; then          # covers Architecture: all
-    emit "${pkg}"
-  fi
-done
+IN="${1:?usage: $0 combined.txt}"
+NATIVE="arm64"
+FROM_COMPAT="i386"
+TO_COMPAT="armhf"
+
+tmp="$(mktemp -d)"; trap 'rm -rf "$tmp"' EXIT
+MAP="$tmp/map" Q="$tmp/queries" HAVE="$tmp/have"
+
+# Build query->output map:
+# - native "pkg"       => query "pkg:arm64", output "pkg"
+# - compat "pkg:i386"  => query "pkg:armhf", output "pkg:armhf"
+awk -v from="$FROM_COMPAT" -v to="$TO_COMPAT" -v nat="$NATIVE" '
+  BEGIN{FS=OFS="\t"}
+  /^[[:space:]]*(#|$)/ { next }
+  { gsub(/^[ \t]+|[ \t]+$/,"") }
+  $0 ~ ":" from "$" {
+    base=$0; sub(/:.*/,"",base);
+    print base ":" to, base ":" to; next
+  }
+  $0 !~ /:/ {
+    base=$0;
+    print base ":" nat, base; next
+  }
+  # ignore any other arch-suffixed lines
+' "$IN" | sort -u > "$MAP"
+
+# Enable compat arch if needed (once)
+if grep -q ":$TO_COMPAT" "$MAP" && ! dpkg --print-foreign-architectures | grep -qx "$TO_COMPAT"; then
+  dpkg --add-architecture "$TO_COMPAT"
+fi
+
+apt-get -qq -o Acquire::Languages=none update >/dev/null
+
+cut -f1 "$MAP" > "$Q"
+
+# Batch policy; normalize native headers lacking ":arch" to ":$NATIVE"
+xargs -a "$Q" -r apt-cache policy -- 2>/dev/null \
+| awk -v nat="$NATIVE" '
+  /^[^ ]+:$/ {                      # stanza header like "pkg:" or "pkg:armhf:"
+    raw=$1; sub(/:$/,"",raw)        # strip trailing colon
+    if (raw ~ /:[^:]+$/) p=raw      # already has :arch
+    else p=raw ":" nat              # add native arch when missing
+    next
+  }
+  /^  Candidate:/ && $2!="(none)" { print p }
+' > "$HAVE"
+
+# Map back to requested names and dedupe
+awk -F"\t" 'NR==FNR {m[$1]=$2; next} ($1 in m){print m[$1]}' "$MAP" "$HAVE" | sort -u