From c7c1ebc11b5e68c534efdb88efc83683275c9562 Mon Sep 17 00:00:00 2001 From: Dennis Schwerdel Date: Sun, 19 Dec 2021 12:40:43 +0100 Subject: [PATCH] Add armv5te to automatic builds --- .devcontainer/Dockerfile | 4 ++-- .devcontainer/devcontainer.json | 3 ++- .github/actions/build-deb/Dockerfile | 2 ++ .github/actions/build-deb/entrypoint.sh | 2 ++ .github/actions/build-static/Dockerfile | 2 ++ .github/actions/build-static/entrypoint.sh | 2 ++ CHANGELOG.md | 3 +++ Cargo.toml | 2 +- 8 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index db4918b..cefa48f 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -11,8 +11,8 @@ RUN chown vscode: -R /usr/local/rustup /usr/local/cargo USER vscode -RUN rustup default 1.51.0 \ +RUN rustup default 1.57.0 \ && rustup component add clippy rust-src rustfmt -RUN cargo install cargo-outdated cargo-cache \ +RUN cargo install cargo-outdated cargo-cache cargo-criterion \ && cargo cache -a \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index aea8672..2ec4fb2 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -25,7 +25,8 @@ "editorconfig.editorconfig", "swellaby.vscode-rust-test-adapter", "matklad.rust-analyzer", - "asciidoctor.asciidoctor-vscode" + "asciidoctor.asciidoctor-vscode", + "ms-vscode.test-adapter-converter" ], // Use 'forwardPorts' to make a list of ports inside the container available locally. // "forwardPorts": [], diff --git a/.github/actions/build-deb/Dockerfile b/.github/actions/build-deb/Dockerfile index c2e0889..88e6289 100644 --- a/.github/actions/build-deb/Dockerfile +++ b/.github/actions/build-deb/Dockerfile @@ -6,8 +6,10 @@ RUN apt-get update \ curl \ gcc-aarch64-linux-gnu \ gcc-arm-linux-gnueabihf \ + gcc-arm-linux-gnueabi \ libc6-dev-arm64-cross \ libc6-dev-armhf-cross \ + libc6-dev-armel-cross \ libc6-dev-i386 \ gcc-5-multilib \ asciidoctor \ diff --git a/.github/actions/build-deb/entrypoint.sh b/.github/actions/build-deb/entrypoint.sh index 166a9c1..4edab0c 100755 --- a/.github/actions/build-deb/entrypoint.sh +++ b/.github/actions/build-deb/entrypoint.sh @@ -13,6 +13,7 @@ curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${TOOLCHAIN} source $HOME/.cargo/env rustup target add i686-unknown-linux-gnu +rustup target add armv5te-unknown-linux-gnueabi rustup target add armv7-unknown-linux-gnueabihf rustup target add aarch64-unknown-linux-gnu @@ -32,4 +33,5 @@ cp target/debian/vpncloud_${DEB_VERSION}_amd64.deb dist/vpncloud_${DEB_VERSION}_ build_deb i386 i686-unknown-linux-gnu build_deb armhf armv7-unknown-linux-gnueabihf +build_deb armel armv5te-unknown-linux-gnueabi build_deb arm64 aarch64-unknown-linux-gnu \ No newline at end of file diff --git a/.github/actions/build-static/Dockerfile b/.github/actions/build-static/Dockerfile index ed488af..2705814 100644 --- a/.github/actions/build-static/Dockerfile +++ b/.github/actions/build-static/Dockerfile @@ -6,8 +6,10 @@ RUN apt-get update \ curl \ gcc-aarch64-linux-gnu \ gcc-arm-linux-gnueabihf \ + gcc-arm-linux-gnueabi \ libc6-dev-arm64-cross \ libc6-dev-armhf-cross \ + libc6-dev-armel-cross \ libc6-dev-i386 \ gcc-5-multilib \ asciidoctor \ diff --git a/.github/actions/build-static/entrypoint.sh b/.github/actions/build-static/entrypoint.sh index 4bc0ac3..deea9ab 100755 --- a/.github/actions/build-static/entrypoint.sh +++ b/.github/actions/build-static/entrypoint.sh @@ -17,6 +17,7 @@ source $HOME/.cargo/env rustup target add x86_64-unknown-linux-musl rustup target add i686-unknown-linux-musl +rustup target add armv5te-unknown-linux-musleabi rustup target add armv7-unknown-linux-musleabihf rustup target add aarch64-unknown-linux-musl @@ -34,4 +35,5 @@ build_static() { build_static amd64 x86_64-unknown-linux-musl #build_static i386 i686-unknown-linux-musl build_static armhf armv7-unknown-linux-musleabihf +build_static armel armv5te-unknown-linux-musleabi build_static arm64 aarch64-unknown-linux-musl \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 72ed852..ae8de9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,11 @@ This project follows [semantic versioning](http://semver.org). ### UNRELEASED +- [added] Added build for armv5te (thanks to xek) - [added] Option to specify advertised addresses - [added] Peers now learn their own address from peers +- [changed] Changed Rust version to 1.57.0 +- [changed] Updated dependencies - [fixed] Fixed problem with IPv4 addresses in listen option ### v2.2.0 (2021-04-06) diff --git a/Cargo.toml b/Cargo.toml index ebdcb34..17c31a4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ readme = "README.md" edition = "2018" [package.metadata] -toolchain = "1.51.0" +toolchain = "1.57.0" upx_version = "3.96" [dependencies]