Skip to content

Commit fe0b272

Browse files
authored
Merge pull request #13 from fermyon/update_ci
update CI
2 parents e84c865 + d8700b7 commit fe0b272

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
config:
26-
- { target: "x86_64-unknown-linux-gnu", os: "ubuntu-latest", arch: "amd64", extension: "" }
27-
# TODO: the cross-compile to Linux aarch64 fails with a pkg-config error that
28-
# I don't yet know how to resolve
29-
# - { target: "aarch64-unknown-linux-gnu", os: "ubuntu-latest", arch: "aarch64", extension: "" }
26+
- { target: "x86_64-unknown-linux-gnu", os: "ubuntu-20.04", arch: "amd64", extension: ""}
27+
- { target: "aarch64-unknown-linux-gnu", os: "ubuntu-20.04", arch: "aarch64", extension: "", extraArg: "--features openssl/vendored" }
3028
- { target: "x86_64-apple-darwin", os: "macos-latest", arch: "amd64", extension: "" }
3129
- { target: "aarch64-apple-darwin", os: "macos-latest", arch: "aarch64", extension: "" }
3230
- { target: "x86_64-pc-windows-msvc", os: "windows-latest", arch: "amd64", extension: ".exe" }
@@ -56,7 +54,7 @@ jobs:
5654
echo '[target.aarch64-unknown-linux-gnu]' >> ${HOME}/.cargo/config.toml
5755
echo 'linker = "aarch64-linux-gnu-gcc"' >> ${HOME}/.cargo/config.toml
5856
- name: Build plugin binary
59-
run: cargo build --release --target ${{ matrix.config.target }}
57+
run: cargo build --release --target ${{ matrix.config.target }} ${{ matrix.config.extraArg }}
6058
- name: Copy plugin binary to standard location
6159
shell: bash
6260
run: cp target/${{ matrix.config.target }}/release/${{ env.PROGRAM_NAME}}${{ matrix.config.extension }} target/release/${{ env.PROGRAM_NAME}}${{ matrix.config.extension }}

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,10 @@ tracing = { version = "0.1", features = ["log"] }
2828
tracing-subscriber = { version = "0.3.7", features = ["env-filter"] }
2929
wasmtime = { version = "18.0.1" }
3030

31+
[target.'cfg(target_os = "linux")'.dependencies]
32+
# This needs to be an explicit dependency to enable
33+
# '--features openssl/vendored', which is used for Linux releases.
34+
openssl = { version = "0.10" }
35+
3136
[workspace.dependencies]
3237
wit-bindgen = "0.16.0"

0 commit comments

Comments
 (0)