Skip to content

Commit c9836f5

Browse files
committed
240325
1 parent 9673646 commit c9836f5

File tree

3 files changed

+25
-21
lines changed

3 files changed

+25
-21
lines changed

.github/workflows/build.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,19 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
arch:
18-
- amd64
19-
- arm64
17+
include:
18+
- arch: amd64
19+
sys: x86_64-linux
20+
- arch: arm64/v8
21+
sys: aarch64-linux
2022
steps:
2123

24+
- name: setup-podman
25+
uses: TerrorJack/setup-podman@master
26+
2227
- name: checkout
2328
uses: actions/checkout@v4
2429

25-
- name: install-deps
26-
run: |
27-
sudo apt update
28-
sudo apt install -y \
29-
qemu-user-static
30-
3130
- name: build-image
3231
run: |
3332
pushd "$(mktemp -d)"
@@ -45,40 +44,43 @@ jobs:
4544
run: |
4645
podman run \
4746
--arch ${{ matrix.arch }} \
47+
--env RUSTFLAGS="-C target-feature=+crt-static" \
4848
--init \
4949
--network host \
5050
--rm \
5151
--tmpfs /tmp:exec \
5252
--volume $PWD:/workspace \
5353
--workdir /workspace \
5454
rust:alpine-mimalloc \
55-
./build.sh
55+
sh -c 'TARGET=$(rustc -vV | sed -n "s|host: ||p") && exec ./build.sh --target $TARGET'
5656
57+
MIMALLOC_VERBOSE=1 ./bin/wasm-component-ld --help
5758
MIMALLOC_VERBOSE=1 ./bin/wasm-tools --version
5859
MIMALLOC_VERBOSE=1 ./bin/wasmtime --version
5960
MIMALLOC_VERBOSE=1 ./bin/wit-bindgen --version
6061
MIMALLOC_VERBOSE=1 ./bin/wizer --version
6162
63+
file ./bin/wasm-component-ld
6264
file ./bin/wasm-tools
6365
file ./bin/wasmtime
6466
file ./bin/wit-bindgen
6567
file ./bin/wizer
6668
67-
mkdir wasm-tools-${{ github.ref_name }}-linux-${{ matrix.arch }}
68-
mv bin wasm-tools-${{ github.ref_name }}-linux-${{ matrix.arch }}
69+
mkdir wasm-tools-${{ github.ref_name }}-${{ matrix.sys }}
70+
mv bin wasm-tools-${{ github.ref_name }}-${{ matrix.sys }}
6971
tar \
7072
--sort=name \
7173
--mtime=1970-01-01T00:00:00Z \
7274
--owner=0 --group=0 --numeric-owner \
7375
--use-compress-program="zstd --ultra -22 --threads=0" \
74-
-cf wasm-tools-${{ github.ref_name }}-linux-${{ matrix.arch }}.tar.zst \
75-
wasm-tools-${{ github.ref_name }}-linux-${{ matrix.arch }}
76+
-cf wasm-tools-${{ github.ref_name }}-${{ matrix.sys }}.tar.zst \
77+
wasm-tools-${{ github.ref_name }}-${{ matrix.sys }}
7678
7779
- name: upload-artifact
7880
uses: actions/upload-artifact@v4
7981
with:
80-
name: wasm-tools-${{ github.ref_name }}-linux-${{ matrix.arch }}
81-
path: wasm-tools-${{ github.ref_name }}-linux-${{ matrix.arch }}.tar.zst
82+
name: wasm-tools-${{ github.ref_name }}-${{ matrix.sys }}
83+
path: wasm-tools-${{ github.ref_name }}-${{ matrix.sys }}.tar.zst
8284

8385
darwin:
8486
name: darwin-${{ matrix.arch }}
@@ -102,6 +104,7 @@ jobs:
102104
run: |
103105
./build.sh --target ${{ matrix.arch }}-apple-darwin
104106
107+
file ./bin/wasm-component-ld
105108
file ./bin/wasm-tools
106109
file ./bin/wasmtime
107110
file ./bin/wit-bindgen
@@ -156,7 +159,7 @@ jobs:
156159
--all-features `
157160
--root wasm-tools-${{ github.ref_name }}-windows-${{ matrix.arch }} `
158161
--target ${{ matrix.arch }}-pc-windows-msvc `
159-
wasm-tools wit-bindgen-cli wasmtime-cli
162+
wasm-component-ld wasm-tools wit-bindgen-cli wasmtime-cli
160163
161164
- name: upload-artifact
162165
uses: actions/upload-artifact@v4

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
Static builds of `wasm-tools`, `wasmtime-cli`, `wizer` for
44
{x86_64,aarch64}-{linux,darwin,windows}:
55

6+
- `wasm-component-ld`: `v0.1.4`
67
- `wasm-tools`: `v1.201.0`
7-
- `wasmtime-cli`: `v18.0.2`
8-
- `wit-bindgen-cli`: `v0.20.0`
9-
- `wizer`: `v4.0.0-git`
8+
- `wasmtime-cli`: `v19.0.0`
9+
- `wit-bindgen-cli`: `v0.22.0`
10+
- `wizer`: `v5.0.0-git`

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cargo install \
1515
--config 'profile.release.lto = "thin"' \
1616
--config 'profile.release.strip = "symbols"' \
1717
--root "$PWD" \
18-
wasm-tools wit-bindgen-cli ${1+"$@"}
18+
wasm-component-ld wasm-tools wit-bindgen-cli ${1+"$@"}
1919

2020
cargo install \
2121
--all-features \

0 commit comments

Comments
 (0)