More multi arch adjustments

williamdes · williamdes · commit 2f84740475b9 · 2023-02-22T11:46:39.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
             fail-fast: false
             max-parallel: 4
             matrix:
-                platform: ["linux/amd64", "linux/arm/v6", "linux/arm/v7", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/s390x"]
+                platform: ["linux/amd64", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/s390x"]
         steps:
             - name: Checkout repository
               uses: actions/checkout@v3
diff --git a/Makefile b/Makefile
@@ -1,7 +1,9 @@
 IMAGE_TAG ?= docker-rustpython
 # All: linux/386,linux/amd64,linux/arm/v5,linux/arm/v7,linux/arm64/v8,linux/mips64le,linux/ppc64le,linux/s390x
 # Supported by rust (Debian variant, alpine has 2 less): linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8
-# Supported by alpine: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
+# Supported by alpine: linux/386,linux/amd64,linux/s390x
+# Fails to build: linux/ppc64le,linux/arm64/v8
+# Fails to fetch doc git crate: linux/arm/v6,linux/arm/v7
 PLATFORM ?= linux/amd64
 
 ACTION ?= load
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -25,7 +25,7 @@ RUN sed -i 's#{ git = .*#{ path = "/workdir/rp__doc__/" }#' /workdir/derive-impl
 
 RUN cargo fetch
 
-RUN uname -m && cargo build --features freeze-stdlib --release --locked --offline --bin rustpython
+RUN if [ "$(uname -m)" != "ppc64le" ] && [ "$(uname -m)" != "s390x" ] && [ "$(uname -m)" != "aarch64" ]; then cargo build --features freeze-stdlib --release --locked --offline --bin rustpython; else cargo build --release --locked --offline --bin rustpython; fi
 
 FROM alpine:3.17
 
