Skip to content

Commit 74807cf

Browse files
committed
chore(ci): fix docker releases and musl linking
1 parent cb8775c commit 74807cf

2 files changed

Lines changed: 15 additions & 8 deletions

File tree

.github/workflows/docker.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ jobs:
8787
8888
- name: Fetch release binaries
8989
run: |
90-
aws s3 cp s3://vorc/iroh-relay-linux-amd64-${{ inputs.base_hash }} bins/linux/amd64/iroh-relay
91-
aws s3 cp s3://vorc/iroh-dns-server-linux-amd64-${{ inputs.base_hash }} bins/linux/amd64/iroh-dns-server
90+
aws s3 cp s3://vorc/iroh-relay-linux-amd64-musl-${{ inputs.base_hash }} bins/linux/amd64/iroh-relay
91+
aws s3 cp s3://vorc/iroh-dns-server-linux-amd64-musl-${{ inputs.base_hash }} bins/linux/amd64/iroh-dns-server
92+
93+
aws s3 cp s3://vorc/iroh-relay-linux-aarch64-musl-${{ inputs.base_hash }} bins/linux/arm64/iroh-relay
94+
aws s3 cp s3://vorc/iroh-dns-server-linux-aarch64-musl-${{ inputs.base_hash }} bins/linux/arm64/iroh-dns-server
9295
93-
aws s3 cp s3://vorc/iroh-relay-linux-aarch64-${{ inputs.base_hash }} bins/linux/arm64/iroh-relay
94-
aws s3 cp s3://vorc/iroh-dns-server-linux-aarch64-${{ inputs.base_hash }} bins/linux/arm64/iroh-dns-server
95-
9696
- name: Build Docker image (iroh-relay)
9797
uses: docker/build-push-action@v7
9898
with:
@@ -111,4 +111,4 @@ jobs:
111111
tags: n0computer/iroh-dns-server:latest,n0computer/iroh-dns-server:${{ inputs.release_version }}
112112
target: iroh-dns-server
113113
platforms: linux/amd64,linux/arm64/v8
114-
file: docker/Dockerfile.ci
114+
file: docker/Dockerfile.ci

.github/workflows/release.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ jobs:
198198
# Native build on self-hosted linux runners; use musl-gcc from musl-tools.
199199
export CARGO_TARGET_$(echo ${{ matrix.cargo_targets }} | tr 'a-z-' 'A-Z_')_LINKER=musl-gcc
200200
export CC=musl-gcc
201+
export RUSTFLAGS="${RUSTFLAGS:-} -C target-feature=+crt-static"
201202
fi
202203
cargo build --profile optimized-release --all-features --target ${{ matrix.cargo_targets }}
203204
@@ -214,14 +215,14 @@ jobs:
214215
key: awscli-${{ runner.os }}-${{ runner.arch }}-v2
215216

216217
- name: Download awscli (linux x86_64)
217-
if: matrix.name == 'ubuntu-latest' && steps.cache-awscli.outputs.cache-hit != 'true'
218+
if: matrix.os == 'ubuntu-latest' && matrix.release-arch == 'amd64' && steps.cache-awscli.outputs.cache-hit != 'true'
218219
run: |
219220
mkdir -p ~/awscli
220221
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o ~/awscli/awscliv2.zip
221222
cd ~/awscli && unzip -oq awscliv2.zip
222223
223224
- name: Download awscli (linux aarch64)
224-
if: matrix.name == 'ubuntu-arm-latest' && steps.cache-awscli.outputs.cache-hit != 'true'
225+
if: matrix.os == 'ubuntu-latest' && matrix.release-arch == 'aarch64' && steps.cache-awscli.outputs.cache-hit != 'true'
225226
run: |
226227
mkdir -p ~/awscli
227228
curl "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o ~/awscli/awscliv2.zip
@@ -260,6 +261,12 @@ jobs:
260261
aws s3 cp ./target/${{ matrix.cargo_targets }}/optimized-release/iroh-relay s3://vorc/iroh-relay-${RELEASE_OS}-${RELEASE_ARCH}-latest --no-progress
261262
aws s3 cp ./target/${{ matrix.cargo_targets }}/optimized-release/iroh-dns-server s3://vorc/iroh-dns-server-${RELEASE_OS}-${RELEASE_ARCH}-latest --no-progress
262263
264+
- name: push docker release
265+
if: matrix.os == 'ubuntu-latest' && matrix.libc == 'musl'
266+
run: |
267+
aws s3 cp ./target/${{ matrix.cargo_targets }}/optimized-release/iroh-relay s3://vorc/iroh-relay-${RELEASE_OS}-${RELEASE_ARCH}-musl-${GITHUB_SHA::7} --no-progress
268+
aws s3 cp ./target/${{ matrix.cargo_targets }}/optimized-release/iroh-dns-server s3://vorc/iroh-dns-server-${RELEASE_OS}-${RELEASE_ARCH}-musl-${GITHUB_SHA::7} --no-progress
269+
263270
- name: Build archives
264271
if: matrix.os != 'windows-latest'
265272
shell: bash

0 commit comments

Comments
 (0)