Skip to content

Commit af12f01

Browse files
committed
fix release CI: vendored openssl for cross-compilation
1 parent a0b667f commit af12f01

3 files changed

Lines changed: 17 additions & 9 deletions

File tree

.github/workflows/release.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,16 @@ jobs:
1616
include:
1717
- target: aarch64-apple-darwin
1818
os: macos-latest
19+
cross: false
1920
- target: x86_64-apple-darwin
2021
os: macos-latest
22+
cross: true
2123
- target: x86_64-unknown-linux-gnu
2224
os: ubuntu-latest
25+
cross: false
2326
- target: aarch64-unknown-linux-gnu
2427
os: ubuntu-latest
28+
cross: true
2529

2630
runs-on: ${{ matrix.os }}
2731

@@ -36,21 +40,15 @@ jobs:
3640
- name: Install cross-compilation tools (aarch64 Linux)
3741
if: matrix.target == 'aarch64-unknown-linux-gnu'
3842
run: |
39-
sudo dpkg --add-architecture arm64
40-
sudo sed -i 's/^deb /deb [arch=amd64] /' /etc/apt/sources.list.d/*.list
41-
echo "deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs) main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/arm64.list
42-
echo "deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs)-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm64.list
4343
sudo apt-get update
44-
sudo apt-get install -y gcc-aarch64-linux-gnu libssl-dev:arm64
44+
sudo apt-get install -y gcc-aarch64-linux-gnu
4545
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
46-
echo "PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu" >> $GITHUB_ENV
47-
echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV
4846
4947
- name: Build weave-mcp
50-
run: cargo build --release --target ${{ matrix.target }} --bin weave-mcp
48+
run: cargo build --release --target ${{ matrix.target }} --bin weave-mcp ${{ matrix.cross && '--features vendored-openssl' || '' }}
5149

5250
- name: Build weave-cli
53-
run: cargo build --release --target ${{ matrix.target }} --bin weave
51+
run: cargo build --release --target ${{ matrix.target }} --bin weave ${{ matrix.cross && '--features vendored-openssl' || '' }}
5452

5553
- name: Package binaries
5654
run: |

crates/weave-cli/Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@ colored = "2"
1717
diffy = "0.4"
1818
serde = { version = "1", features = ["derive"] }
1919
serde_json = "1"
20+
openssl = { version = "0.10", features = ["vendored"], optional = true }
21+
22+
[features]
23+
default = []
24+
vendored-openssl = ["openssl"]

crates/weave-mcp/Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,8 @@ serde = { version = "1", features = ["derive"] }
1818
serde_json = "1"
1919
schemars = "1"
2020
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
21+
openssl = { version = "0.10", features = ["vendored"], optional = true }
22+
23+
[features]
24+
default = []
25+
vendored-openssl = ["openssl"]

0 commit comments

Comments
 (0)