Skip to content

Commit

Permalink
Remove protobuf runner install and remove multi-arch specifier for pr…
Browse files Browse the repository at this point in the history
…otobuf-compiler
  • Loading branch information
scottopell committed Mar 14, 2024
1 parent b39f13b commit ab369dc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
11 changes: 0 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,6 @@ jobs:
with:
tool: cross

- name: Install protobuf (Apt)
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
if: matrix.os == 'ubuntu-20.04'

- name: Install protobuf (Brew)
run: brew install protobuf
if: matrix.os == 'macos-latest'

- name: Check protobuf
run: protoc --version; which protoc; echo "PROTOC IS ${PROTOC}";

# Run the build & upload artifacts
- name: Build and upload lading binaries
uses: taiki-e/upload-rust-binary-action@v1
Expand Down
8 changes: 4 additions & 4 deletions Cross.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
[target.aarch64-unknown-linux-gnu]
pre-build = [
"dpkg --add-architecture $CROSS_DEB_ARCH",
"apt-get update && apt-get --assume-yes install protobuf-compiler:$CROSS_DEB_ARCH"
"apt-get update && apt-get --assume-yes install protobuf-compiler"
]
[target.aarch64-unknown-linux-musl]
pre-build = [
"dpkg --add-architecture $CROSS_DEB_ARCH",
"apt-get update && apt-get --assume-yes install protobuf-compiler:$CROSS_DEB_ARCH"
"apt-get update && apt-get --assume-yes install protobuf-compiler"
]
[target.x86_64-unknown-linux-gnu]
pre-build = [
"dpkg --add-architecture $CROSS_DEB_ARCH",
"apt-get update && apt-get --assume-yes install protobuf-compiler:$CROSS_DEB_ARCH"
"apt-get update && apt-get --assume-yes install protobuf-compiler"
]
[target.x86_64-unknown-linux-musl]
pre-build = [
"dpkg --add-architecture $CROSS_DEB_ARCH",
"apt-get update && apt-get --assume-yes install protobuf-compiler:$CROSS_DEB_ARCH"
"apt-get update && apt-get --assume-yes install protobuf-compiler"
]
[target.x86_64-apple-darwin]
pre-build = [
Expand Down

0 comments on commit ab369dc

Please sign in to comment.