diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba7c318..3c25e4e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -96,7 +96,7 @@ jobs: - name: Install Rust stable uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.89.0 # "stable" causes rust-lld: error on aarch64-linux target: ${{ matrix.target }} override: true diff --git a/Cross.toml b/Cross.toml index 6484d44..ce22ddb 100644 --- a/Cross.toml +++ b/Cross.toml @@ -1,23 +1,34 @@ [target.x86_64-unknown-linux-gnu] -pre-build = ["apt-get update && apt-get install --assume-yes unzip ", -"PB_REL='https://github.com/protocolbuffers/protobuf/releases'", -"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip", -"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"] +pre-build = [ + "dpkg --add-architecture $CROSS_DEB_ARCH", + "apt-get update && apt-get install --assume-yes unzip libssl-dev:$CROSS_DEB_ARCH", + "PB_REL='https://github.com/protocolbuffers/protobuf/releases'", + "PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip", + "unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr" +] [target.armv7-unknown-linux-gnueabihf] -pre-build = ["apt-get update && apt-get install --assume-yes unzip ", -"PB_REL='https://github.com/protocolbuffers/protobuf/releases'", -"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip", -"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"] +pre-build = [ + "dpkg --add-architecture $CROSS_DEB_ARCH", + "apt-get update && apt-get install --assume-yes unzip libssl-dev:$CROSS_DEB_ARCH", + "PB_REL='https://github.com/protocolbuffers/protobuf/releases'", + "PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip", + "unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr" +] [target.aarch64-unknown-linux-gnu] -pre-build = ["apt-get update && apt-get install --assume-yes unzip ", -"PB_REL='https://github.com/protocolbuffers/protobuf/releases'", -"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip", -"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"] +pre-build = [ + "dpkg --add-architecture $CROSS_DEB_ARCH", + "apt-get update && apt-get install --assume-yes unzip libssl-dev libssl-dev:$CROSS_DEB_ARCH", + "PB_REL='https://github.com/protocolbuffers/protobuf/releases'", + "PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip", + "unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr" +] [target.x86_64-unknown-freebsd] -pre-build = ["apt-get update && apt-get install --assume-yes unzip ", -"PB_REL='https://github.com/protocolbuffers/protobuf/releases'", -"PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip", -"unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr"] +pre-build = [ + "apt-get update && apt-get install --assume-yes unzip libssl-dev", + "PB_REL='https://github.com/protocolbuffers/protobuf/releases'", + "PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip", + "unzip protoc-$PB_VERSION-linux-x86_64.zip bin/protoc include/google/* -d /usr" +]