Skip to content

Commit 765cfef

Browse files
committed
fix(ci): add protoc+cmake to cross containers, remove --locked
Cross containers need protobuf-compiler and cmake for aws-lc-sys. Remove --locked since patch stripping makes lockfile stale.
1 parent 0666e05 commit 765cfef

2 files changed

Lines changed: 18 additions & 1 deletion

File tree

.github/workflows/release.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@ jobs:
5050
steps:
5151
- uses: actions/checkout@v4
5252

53+
- name: Install system dependencies (Linux)
54+
if: runner.os == 'Linux'
55+
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler libssl-dev pkg-config
56+
57+
- name: Install system dependencies (macOS)
58+
if: runner.os == 'macOS'
59+
run: brew install protobuf
60+
5361
- name: Install Rust toolchain
5462
uses: dtolnay/rust-toolchain@stable
5563
with:
@@ -82,7 +90,7 @@ jobs:
8290
if [ "${{ matrix.use_cross }}" = "true" ]; then
8391
BUILD_CMD="cross"
8492
fi
85-
$BUILD_CMD build --release --target ${{ matrix.target }} --locked
93+
$BUILD_CMD build --release --target ${{ matrix.target }}
8694
8795
- name: Package archive
8896
run: |

Cross.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[target.x86_64-unknown-linux-gnu]
2+
pre-build = ["apt-get update && apt-get install -y protobuf-compiler cmake"]
3+
4+
[target.x86_64-unknown-linux-musl]
5+
pre-build = ["apt-get update && apt-get install -y protobuf-compiler cmake musl-tools"]
6+
7+
[target.aarch64-unknown-linux-gnu]
8+
pre-build = ["apt-get update && apt-get install -y protobuf-compiler cmake"]
9+

0 commit comments

Comments
 (0)