Skip to content

Commit 0ad9dfc

Browse files
Fix arch specific download
1 parent 302b4f2 commit 0ad9dfc

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
- ghcr.io/swiftwasm/swift:5.8-bionic
1818
- ghcr.io/swiftwasm/swift:bionic
1919
- dockerfile: ./5.8/ubuntu/20.04/Dockerfile
20-
platforms: 'linux/amd64'
20+
platforms: 'linux/amd64,linux/arm64'
2121
tags:
2222
- ghcr.io/swiftwasm/swift:5.8-focal
2323
- ghcr.io/swiftwasm/swift:focal
2424
- dockerfile: ./5.8/ubuntu/22.04/Dockerfile
25-
platforms: 'linux/amd64,linux/arm64'
25+
platforms: 'linux/amd64'
2626
tags:
2727
- ghcr.io/swiftwasm/swift:5.8-jammy
2828
- ghcr.io/swiftwasm/swift:jammy

5.8/ubuntu/20.04/Dockerfile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,22 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
2525

2626

2727
ARG SWIFT_TAG=swift-wasm-5.8.0-RELEASE
28-
ENV SWIFT_PLATFORM_SUFFIX=ubuntu20.04_x86_64.tar.gz
28+
ENV SWIFT_PLATFORM=ubuntu20.04
2929
ENV SWIFT_TAG=$SWIFT_TAG
3030

3131
RUN set -e; \
32-
SWIFT_BIN_URL="https://github.com/swiftwasm/swift/releases/download/$SWIFT_TAG/$SWIFT_TAG-$SWIFT_PLATFORM_SUFFIX" \
32+
ARCH_NAME="$(dpkg --print-architecture)"; \
33+
url=; \
34+
case "${ARCH_NAME##*-}" in \
35+
'amd64') \
36+
OS_ARCH_SUFFIX='x86_64'; \
37+
;; \
38+
'arm64') \
39+
OS_ARCH_SUFFIX='aarch64'; \
40+
;; \
41+
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
42+
esac; \
43+
SWIFT_BIN_URL="https://github.com/swiftwasm/swift/releases/download/$SWIFT_TAG/$SWIFT_TAG-${SWIFT_PLATFORM}_${OS_ARCH_SUFFIX}.tar.gz" \
3344
&& export DEBIAN_FRONTEND=noninteractive \
3445
&& apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
3546
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz \

0 commit comments

Comments
 (0)