Skip to content

Commit 3b7179f

Browse files
dahliadahlia
committed
Linux ARM64 build
1 parent 01f40ae commit 3b7179f

File tree

5 files changed

+109
-47
lines changed

5 files changed

+109
-47
lines changed

‎.github/workflows/build.yaml

+89-39
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
os:
16-
- ubuntu-22.04
17-
- macos-12 # Intel
18-
- macos-13-xlarge # Apple silicon
16+
- ubuntu-24.04
17+
- macos-13 # Intel
18+
- macos-14 # Apple silicon
1919
- windows-2022
2020
ghc-version:
2121
- "8.8"
@@ -24,20 +24,22 @@ jobs:
2424
- "9.2"
2525
- "9.4"
2626
exclude:
27-
- os: macos-12
27+
- os: macos-13
2828
ghc-version: "8.10"
29-
- os: macos-12
29+
- os: macos-13
3030
ghc-version: "9.0"
31-
- os: macos-12
31+
- os: macos-13
3232
ghc-version: "9.2"
33-
- os: macos-13-xlarge
33+
- os: macos-14
3434
ghc-version: "8.8"
35-
- os: macos-13-xlarge
35+
- os: macos-14
3636
ghc-version: "8.10"
37-
- os: macos-13-xlarge
37+
- os: macos-14
3838
ghc-version: "9.0"
39-
- os: macos-13-xlarge
39+
- os: macos-14
4040
ghc-version: "9.2"
41+
- os: windows-2022
42+
ghc-version: "8.8"
4143
- os: windows-2022
4244
ghc-version: "8.10"
4345
- os: windows-2022
@@ -70,6 +72,10 @@ jobs:
7072
%APPDATA%\cabal\store
7173
%APPDATA%\stack
7274
key: stack-${{ matrix.os }}-ghc-${{ matrix.version }}
75+
- name: Install dependencies (Linux)
76+
if: "startsWith(matrix.os, 'ubuntu-')"
77+
run: |
78+
sudo apt install libbz2-dev
7379
- name: Install Haskell Stack (if not installed)
7480
shell: bash
7581
run: |
@@ -121,14 +127,8 @@ jobs:
121127
matrix.ghc-version == '9.2'
122128
shell: bash
123129
run: |
124-
curl -L -o /tmp/pandoc.deb \
125-
https://github.com/jgm/pandoc/releases/download/2.14.2/pandoc-2.14.2-1-amd64.deb
126-
sudo dpkg -i /tmp/pandoc.deb
127-
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64
128-
sudo add-apt-repository ppa:rmescandon/yq
129-
sudo apt update
130-
sudo apt-get install -y yq
131-
bash scripts/haddock-prologue/build.sh
130+
sudo apt-get install -y pandoc yq
131+
PATH="/usr/bin:$PATH" bash scripts/haddock-prologue/build.sh
132132
- name: Copy docs
133133
if: >-
134134
startsWith(matrix.os, 'ubuntu-') &&
@@ -178,9 +178,9 @@ jobs:
178178
fail-fast: false
179179
matrix:
180180
os:
181-
- ubuntu-22.04
182-
- macos-12 # Intel
183-
- macos-13-xlarge # Apple silicon
181+
- ubuntu-24.04
182+
- macos-13 # Intel
183+
- macos-14 # Apple silicon
184184
- windows-2022
185185
steps:
186186
- uses: actions/checkout@v4
@@ -266,12 +266,21 @@ jobs:
266266
267267
image:
268268
name: Docker image
269-
runs-on: ubuntu-22.04
269+
strategy:
270+
fail-fast: false
271+
matrix:
272+
os:
273+
- ubuntu-24.04
274+
- ubuntu-24.04-arm
275+
runs-on: ${{ matrix.os }}
270276
env:
271277
DOCKERHUB_IMAGE_NAME: seonbi
272278
outputs:
273279
image-ghcr: ghcr.io/${{ github.repository }}/bin@${{ steps.push-image.outputs.digest }}
274280
image-dockerhub: docker.io/${{ vars.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_IMAGE_NAME }}@${{ steps.push-image.outputs.digest }}
281+
tag: ${{ steps.values.outputs.tag }}
282+
labels: ${{ steps.values.outputs.labels }}
283+
arch: ${{ steps.values.outputs.arch }}
275284
steps:
276285
- uses: actions/checkout@v4
277286
with:
@@ -303,6 +312,11 @@ jobs:
303312
else
304313
echo labels= >> "$GITHUB_OUTPUT"
305314
fi
315+
if [[ "$RUNNER_ARCH" = "ARM64" ]]; then
316+
echo arch=arm64 >> "$GITHUB_OUTPUT"
317+
else
318+
echo arch=amd64 >> "$GITHUB_OUTPUT"
319+
fi
306320
- id: push-image
307321
uses: docker/build-push-action@v6
308322
with:
@@ -313,10 +327,34 @@ jobs:
313327
org.opencontainers.image.url=${{ github.event.repository.html_url }}
314328
${{ steps.values.outputs.labels }}
315329
tags: |
316-
ghcr.io/${{ github.repository }}/bin:${{ steps.values.outputs.tag }}
317-
${{ vars.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_IMAGE_NAME }}:${{ steps.values.outputs.tag }}
330+
ghcr.io/${{ github.repository }}/bin:${{ steps.values.outputs.tag }}-${{ steps.values.outputs.arch }}
331+
${{ vars.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_IMAGE_NAME }}:${{ steps.values.outputs.tag }}-${{ steps.values.outputs.arch }}
318332
provenance: false # https://community.fly.io/t/deploying-to-fly-via-github-action-failing/10171/33
319333

334+
image-manifest:
335+
name: Create and push manifest images
336+
if: github.event_name != 'pull_request'
337+
needs:
338+
- image
339+
runs-on: ubuntu-24.04
340+
env:
341+
DOCKERHUB_IMAGE_NAME: seonbi
342+
steps:
343+
- uses: docker/login-action@v3
344+
with:
345+
registry: ghcr.io
346+
username: ${{ github.repository_owner }}
347+
password: ${{ github.token }}
348+
- uses: docker/login-action@v3
349+
with:
350+
username: ${{ vars.DOCKERHUB_USERNAME }}
351+
password: ${{ secrets.DOCKERHUB_TOKEN }}
352+
- uses: Noelware/[email protected]
353+
with:
354+
inputs: ghcr.io/${{ github.repository }}/bin:${{ needs.image.outputs.tag }},docker.io/${{ vars.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_IMAGE_NAME }}:${{ needs.image.outputs.tag }}
355+
images: ghcr.io/${{ github.repository }}/bin:${{ needs.image.outputs.tag }}-amd64,ghcr.io/${{ github.repository }}/bin:${{ needs.image.outputs.tag }}-arm64
356+
push: true
357+
320358
fly:
321359
name: Deploy seonbi-api to Fly.io
322360
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
@@ -325,7 +363,7 @@ jobs:
325363
env:
326364
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
327365
IMAGE: ${{ needs.image.outputs.image-ghcr }}
328-
runs-on: ubuntu-22.04
366+
runs-on: ubuntu-24.04
329367
steps:
330368
- uses: actions/checkout@v4
331369
- uses: superfly/flyctl-actions/setup-flyctl@master
@@ -345,16 +383,16 @@ jobs:
345383
needs:
346384
- build
347385
- image
348-
runs-on: ubuntu-22.04
386+
runs-on: ubuntu-24.04
349387
steps:
350388
- uses: actions/checkout@v4
351389
- uses: actions/download-artifact@v4
352390
with:
353-
name: binaries-macos-13-xlarge-ghc-9.4
391+
name: binaries-macos-14-ghc-9.4
354392
path: /tmp/binaries-macos-arm64
355393
- uses: actions/download-artifact@v4
356394
with:
357-
name: binaries-macos-12-ghc-9.4
395+
name: binaries-macos-13-ghc-9.4
358396
path: /tmp/binaries-macos-x86_64
359397
- uses: actions/download-artifact@v4
360398
with:
@@ -363,18 +401,30 @@ jobs:
363401
- run: |
364402
set -e
365403
mkdir -p /tmp/dists
366-
# Linux
367-
docker pull "$IMAGE"
368-
mkdir -p /tmp/binaries-linux
369-
docker run -i "$IMAGE" cat /usr/local/bin/seonbi \
370-
> /tmp/binaries-linux/seonbi
371-
docker run -i "$IMAGE" cat /usr/local/bin/seonbi-api \
372-
> /tmp/binaries-linux/seonbi-api
373-
pushd /tmp/binaries-linux
404+
# Linux (amd64)
405+
docker pull "$IMAGE-amd64"
406+
mkdir -p /tmp/binaries-linux-amd64
407+
docker run -i "$IMAGE-amd64" cat /usr/local/bin/seonbi \
408+
> /tmp/binaries-linux-amd64/seonbi
409+
docker run -i "$IMAGE-amd64" cat /usr/local/bin/seonbi-api \
410+
> /tmp/binaries-linux-amd64/seonbi-api
411+
pushd /tmp/binaries-linux-amd64
374412
chmod +x *
375413
cp "$GITHUB_WORKSPACE/"{LICENSE,README.md,CHANGES.md} ./
376414
tar cvfj /tmp/dists/seonbi.linux-x86_64.tar.bz2 *
377415
popd
416+
# Linux (arm64)
417+
docker pull "$IMAGE-arm64"
418+
mkdir -p /tmp/binaries-linux-arm64
419+
docker run -i "$IMAGE-arm64" cat /usr/local/bin/seonbi \
420+
> /tmp/binaries-linux-arm64/seonbi
421+
docker run -i "$IMAGE-arm64" cat /usr/local/bin/seonbi-api \
422+
> /tmp/binaries-linux-arm64/seonbi-api
423+
pushd /tmp/binaries-linux-arm64
424+
chmod +x *
425+
cp "$GITHUB_WORKSPACE/"{LICENSE,README.md,CHANGES.md} ./
426+
tar cvfj /tmp/dists/seonbi.linux-arm64.tar.bz2 *
427+
popd
378428
# macOS (Apple silicon)
379429
pushd /tmp/binaries-macos-arm64
380430
chmod +x *
@@ -404,12 +454,12 @@ jobs:
404454
needs:
405455
- build
406456
- binaries
407-
runs-on: ubuntu-22.04
457+
runs-on: ubuntu-24.04
408458
steps:
409459
- uses: actions/checkout@v4
410460
- uses: actions/download-artifact@v4
411461
with:
412-
name: sdist-ubuntu-22.04-ghc-9.4
462+
name: sdist-ubuntu-24.04-ghc-9.4
413463
path: /tmp/sdist
414464
- uses: actions/download-artifact@v4
415465
with:
@@ -458,7 +508,7 @@ jobs:
458508
if: >-
459509
github.event_name != 'pull_request' &&
460510
github.ref == 'refs/heads/main'
461-
runs-on: ubuntu-22.04
511+
runs-on: ubuntu-24.04
462512
steps:
463513
- uses: actions/checkout@v4
464514
- uses: actions/download-artifact@v4

‎Dockerfile

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# To correctly make a statically-linked binary, we use Alpine Linux.
22
# The distro entirely uses musl instead of glibc which is unfriendly to be
33
# statically linked.
4-
FROM docker.io/amd64/alpine:3.19 AS build
4+
FROM docker.io/alpine:3.19 AS build
55

66
LABEL "org.opencontainers.image.title"="Seonbi"
77
LABEL "org.opencontainers.image.licenses"="LGPL-2.1"
@@ -11,9 +11,13 @@ RUN apk add --no-cache \
1111
bzip2-dev=1.0.8-r6 \
1212
ghc=9.4.7-r1 \
1313
libbz2=1.0.8-r6 \
14+
xz=5.4.5-r0 \
1415
zlib-dev=1.3.1-r0 \
1516
zlib-static=1.3.1-r0
16-
RUN wget -qO- https://get.haskellstack.org/ | sh
17+
18+
RUN wget -q "https://github.com/commercialhaskell/stack/releases/download/v3.3.1/stack-3.3.1-linux-$(uname -m)-bin" \
19+
&& mv "stack-3.3.1-linux-$(uname -m)-bin" /usr/bin/stack \
20+
&& chmod +x /usr/bin/stack
1721

1822
RUN stack config set system-ghc --global true
1923

@@ -26,8 +30,9 @@ WORKDIR /src/seonbi
2630
# Docker will cache this command as a layer, freeing us up to
2731
# modify source code without re-installing dependencies
2832
# (unless the .cabal file changes!)
29-
RUN stack setup
33+
RUN stack setup --system-ghc
3034
RUN stack build \
35+
--system-ghc \
3136
--only-snapshot \
3237
--flag seonbi:iconv \
3338
--flag seonbi:static
@@ -36,11 +41,12 @@ COPY . /src/seonbi
3641
RUN cp /src/seonbi/stack-ghc-9.4.yaml /src/seonbi/stack.yaml
3742

3843
RUN stack build \
44+
--system-ghc \
3945
--flag seonbi:iconv \
4046
--flag seonbi:static \
4147
--copy-bins
4248

43-
FROM docker.io/amd64/alpine:3.14
49+
FROM docker.io/alpine:3.19
4450

4551
COPY --from=build /root/.local/bin/seonbi* /usr/local/bin/
4652
ENV LANG=en_US.UTF-8

‎scripts/deno/mod.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ const STABLE_DOWNLOAD_URLS: DownloadUrls = {
143143
linux: {
144144
x86_64:
145145
"https://github.com/dahlia/seonbi/releases/download/0.5.0/seonbi-0.5.0.linux-x86_64.tar.bz2",
146-
aarch64: undefined,
146+
aarch64:
147+
"https://github.com/dahlia/seonbi/releases/download/0.5.0/seonbi-0.5.0.linux-arm64.tar.bz2",
147148
},
148149
darwin: {
149150
x86_64:
@@ -162,7 +163,8 @@ const NIGHTLY_DOWNLOAD_URLS: DownloadUrls = {
162163
linux: {
163164
x86_64:
164165
"https://dahlia.github.io/seonbi/dists/latest/seonbi.linux-x86_64.tar.bz2",
165-
aarch64: undefined,
166+
aarch64:
167+
"https://dahlia.github.io/seonbi/dists/latest/seonbi.linux-arm64.tar.bz2",
166168
},
167169
darwin: {
168170
x86_64:

‎scripts/haddock-prologue/build.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ cp "$package" "$backup"
1515
cwd="$(pwd)"
1616
exit_code=1
1717
{
18-
yq write --inplace "$package" description "$description"
18+
yq \
19+
-y \
20+
--arg description "$description" \
21+
'.description = $description' \
22+
"$backup" > "$package"
1923
cd "$root"
2024
stack haddock --no-haddock-deps
2125
cd "$(stack path --dist-dir)/doc/html/"

‎stack-ghc-9.4.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-21.25
1+
resolver: lts-21.21
22
packages:
33
- .
44
extra-deps:

0 commit comments

Comments
 (0)