Skip to content

Commit 9e0ac94

Browse files
committed
Stick to Rust 1.89.0
1 parent 437b21c commit 9e0ac94

File tree

2 files changed

+29
-18
lines changed

2 files changed

+29
-18
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ jobs:
9696
- name: Install Rust stable
9797
uses: actions-rs/toolchain@v1
9898
with:
99-
toolchain: stable
100-
target: ${{ matrix.target }}
99+
toolchain: 1.89.0 # "stable" causes rust-lld: error on aarch64-linux target: ${{ matrix.target }}
101100
override: true
102101

103102
- name: Setup `packer`

Cross.toml

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,35 @@
11
[target.x86_64-unknown-linux-gnu]
2-
pre-build = ["apt-get update && apt-get install --assume-yes libssl-dev unzip",
3-
"PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
4-
"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
5-
"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"]
2+
image = "ghcr.io/defguard/cross:x86_64-unknown-linux-gnu"
3+
pre-build = [
4+
"apt-get update && apt-get install --assume-yes libssl-dev unzip",
5+
"PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
6+
"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
7+
"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"
8+
]
69

710
[target.armv7-unknown-linux-gnueabihf]
8-
pre-build = ["apt-get update && apt-get install --assume-yes libssl-dev libssl-dev:$CROSS_DEB_ARCH unzip",
9-
"PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
10-
"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
11-
"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"]
11+
image = "ghcr.io/defguard/cross:armv7-unknown-linux-gnueabihf"
12+
pre-build = [
13+
"apt-get update && apt-get install --assume-yes libssl-dev libssl-dev:$CROSS_DEB_ARCH unzip",
14+
"PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
15+
"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
16+
"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"
17+
]
1218

1319
[target.aarch64-unknown-linux-gnu]
14-
pre-build = ["apt-get update && apt-get install --assume-yes libssl-dev libssl-dev:$CROSS_DEB_ARCH unzip",
15-
"PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
16-
"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
17-
"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"]
20+
image = "ghcr.io/defguard/cross:aarch64-unknown-linux-gnu"
21+
pre-build = [
22+
"apt-get update && apt-get install --assume-yes libssl-dev libssl-dev:$CROSS_DEB_ARCH unzip",
23+
"PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
24+
"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
25+
"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"
26+
]
1827

1928
[target.x86_64-unknown-freebsd]
20-
pre-build = ["apt-get update && apt-get install --assume-yes libssl-dev unzip",
21-
"PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
22-
"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
23-
"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"]
29+
image = "ghcr.io/defguard/cross:x86_64-unknown-freebsd"
30+
pre-build = [
31+
"apt-get update && apt-get install --assume-yes libssl-dev unzip",
32+
"PB_REL='https://github.com/protocolbuffers/protobuf/releases'",
33+
"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip",
34+
"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"
35+
]

0 commit comments

Comments
 (0)