build: all archs

2cd · Mar 26, 2024 · 95849f5 · 95849f5
1 parent 3be339e
commit 95849f5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,20 +9,20 @@ jobs:
       fail-fast: false
       matrix:
         arch:
-          # - x64
-          # - x64v2
-          # - x64v3
-          # - x64v4
-          # - rv64gc
-          # - arm64
-          # - armv7a
-          # - ppc64le
-          # - ppc
-          # - ppc64
-          # - loong64
-          # - i486
-          # - i686
-          # - x86
+          - x64
+          - x64v2
+          - x64v3
+          - x64v4
+          - rv64gc
+          - arm64
+          - armv7a
+          - ppc64le
+          - ppc
+          - ppc64
+          - loong64
+          - i486
+          - i686
+          - x86
     runs-on: ubuntu-latest
     defaults:
       run:

diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 ARG TMM_ARCH_V0
 FROM ghcr.io/2moe/zsh-static:${TMM_ARCH_V0} as zsh-tmm-arch
-FROM ghcr.io/2cd/pacman-static:x64
+FROM ghcr.io/2cd/pacman-static:x64 as pacman
 
 RUN rm -rf /etc/pacman.d
 COPY . /etc
@@ -281,10 +281,13 @@ set -fex
     rm -rfv  /root/*                                 ||:
 CLEAN
 
-# ------------------------
 # SHELL [ "/bin/bash", "-c" ]
 # SHELL ["zsh", "--pipefail", "-fexc"]
 ARG OPT=/opt/bin/
-ENV LANG=C.UTF-8
 COPY --from=zsh-tmm-arch ${OPT}busybox ${OPT}zsh ${OPT}
+# ------------------------
+FROM scratch
+COPY --from=pacman / /
+ENV LANG=C.UTF-8 \
+    PATH=/usr/local/sbin:/usr/local/bin:/usr/local/games:/bin:/usr/games:/opt/sbin:/opt/bin
 CMD [ "bash" ]
diff --git a/src/docker/build b/src/docker/build
@@ -41,8 +41,8 @@ local -A tmm_arch_map=(
 
 arch_repo=ghcr.io/2cd/arch
 # Only for x64: archive, testing
-# x64v4, ppc*, loong64: "", slim
-# other: "", base, base-devel, slim
+# x64v4, ppc*, loong64, i486, i686: "", slim
+# x64, x64v2, x64v3, rv64gc, arm64, armv7a, x86: "", base, base-devel, slim
 #
 # ARCHIVE=true
 # BASE=true
@@ -100,8 +100,8 @@ for tmm_arch arch (${(kv)tmm_arch_map}) {
                     )
                     lower=dev ;|
                 (base*)
-                    if [[ $tmm_arch == x64v4 ]] {
-                        exit
+                    case $tmm_arch {
+                        (x64v4 | i[4-6]86 | ppc* | loong64) exit ;;
                     }
                 ;;
             }