From 81d8b338adc970c8e675d24bfa0dfc51d50992e3 Mon Sep 17 00:00:00 2001 From: zonyitoo Date: Mon, 23 Nov 2020 23:34:13 +0800 Subject: [PATCH] Remove unnecessary customized Dockerfile, RUSTFLAGS is controlled by .cargo/config.toml --- .github/workflows/build-release.yml | 1 - Cross.toml | 28 ++----------------- build/Dockerfile.aarch64-unknown-linux-gnu | 3 -- build/Dockerfile.arm-unknown-linux-gnueabihf | 1 - build/Dockerfile.arm-unknown-linux-musleabi | 1 - build/Dockerfile.arm-unknown-linux-musleabihf | 1 - build/Dockerfile.mips-unknown-linux-musl | 3 -- build/Dockerfile.mipsel-unknown-linux-musl | 3 -- build/Dockerfile.x86_64-pc-windows-gnu | 3 -- build/Dockerfile.x86_64-unknown-linux-gnu | 3 -- build/Dockerfile.x86_64-unknown-linux-musl | 3 -- 11 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 build/Dockerfile.aarch64-unknown-linux-gnu delete mode 100644 build/Dockerfile.arm-unknown-linux-gnueabihf delete mode 100644 build/Dockerfile.arm-unknown-linux-musleabi delete mode 100644 build/Dockerfile.arm-unknown-linux-musleabihf delete mode 100644 build/Dockerfile.mips-unknown-linux-musl delete mode 100644 build/Dockerfile.mipsel-unknown-linux-musl delete mode 100644 build/Dockerfile.x86_64-pc-windows-gnu delete mode 100644 build/Dockerfile.x86_64-unknown-linux-gnu delete mode 100644 build/Dockerfile.x86_64-unknown-linux-musl diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index bed2a2e3..427218d3 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -33,7 +33,6 @@ jobs: timeout-minutes: 120 run: | cd build - docker build -t shadowsocks-rust:${{ matrix.target }} -f Dockerfile.${{ matrix.target }} . ./build-release -t ${{ matrix.target }} - name: Upload Github Assets diff --git a/Cross.toml b/Cross.toml index 89eef268..6f251557 100644 --- a/Cross.toml +++ b/Cross.toml @@ -1,29 +1,5 @@ -[build.env] -passthrough = [ - "HTTP_PROXY", - "HTTPS_PROXY", -] - -[target.x86_64-unknown-linux-musl] -image = "shadowsocks-rust:x86_64-unknown-linux-musl" - -[target.x86_64-unknown-linux-gnu] -image = "shadowsocks-rust:x86_64-unknown-linux-gnu" - -[target.x86_64-pc-windows-gnu] -image = "shadowsocks-rust:x86_64-pc-windows-gnu" - -[target.arm-unknown-linux-gnueabihf] -image = "shadowsocks-rust:arm-unknown-linux-gnueabihf" - -[target.arm-unknown-linux-musleabi] -image = "shadowsocks-rust:arm-unknown-linux-musleabi" - -[target.aarch64-unknown-linux-gnu] -image = "shadowsocks-rust:aarch64-unknown-linux-gnu" - [target.mips-unknown-linux-musl] -image = "shadowsocks-rust:mips-unknown-linux-musl" +image = "rustembedded/cross:mips-unknown-linux-musl-0.2.1" [target.mipsel-unknown-linux-musl] -image = "shadowsocks-rust:mipsel-unknown-linux-musl" +image = "rustembedded/cross:mipsel-unknown-linux-musl-0.2.1" diff --git a/build/Dockerfile.aarch64-unknown-linux-gnu b/build/Dockerfile.aarch64-unknown-linux-gnu deleted file mode 100644 index abeeab55..00000000 --- a/build/Dockerfile.aarch64-unknown-linux-gnu +++ /dev/null @@ -1,3 +0,0 @@ -FROM rustembedded/cross:aarch64-unknown-linux-gnu - -ENV RUSTFLAGS="-Ctarget-feature=+aes,+neon,+crypto" diff --git a/build/Dockerfile.arm-unknown-linux-gnueabihf b/build/Dockerfile.arm-unknown-linux-gnueabihf deleted file mode 100644 index 0711ae4f..00000000 --- a/build/Dockerfile.arm-unknown-linux-gnueabihf +++ /dev/null @@ -1 +0,0 @@ -FROM rustembedded/cross:arm-unknown-linux-gnueabihf diff --git a/build/Dockerfile.arm-unknown-linux-musleabi b/build/Dockerfile.arm-unknown-linux-musleabi deleted file mode 100644 index f2b1269f..00000000 --- a/build/Dockerfile.arm-unknown-linux-musleabi +++ /dev/null @@ -1 +0,0 @@ -FROM rustembedded/cross:arm-unknown-linux-musleabi-0.2.1 diff --git a/build/Dockerfile.arm-unknown-linux-musleabihf b/build/Dockerfile.arm-unknown-linux-musleabihf deleted file mode 100644 index 5bab7bfa..00000000 --- a/build/Dockerfile.arm-unknown-linux-musleabihf +++ /dev/null @@ -1 +0,0 @@ -FROM rustembedded/cross:arm-unknown-linux-musleabihf-0.2.1 diff --git a/build/Dockerfile.mips-unknown-linux-musl b/build/Dockerfile.mips-unknown-linux-musl deleted file mode 100644 index 9836fa6f..00000000 --- a/build/Dockerfile.mips-unknown-linux-musl +++ /dev/null @@ -1,3 +0,0 @@ -FROM rustembedded/cross:mips-unknown-linux-musl-0.2.1 - -# ENV RUSTFLAGS="" diff --git a/build/Dockerfile.mipsel-unknown-linux-musl b/build/Dockerfile.mipsel-unknown-linux-musl deleted file mode 100644 index 9d97f533..00000000 --- a/build/Dockerfile.mipsel-unknown-linux-musl +++ /dev/null @@ -1,3 +0,0 @@ -FROM rustembedded/cross:mipsel-unknown-linux-musl-0.2.1 - -# ENV RUSTFLAGS="" diff --git a/build/Dockerfile.x86_64-pc-windows-gnu b/build/Dockerfile.x86_64-pc-windows-gnu deleted file mode 100644 index f5f2049a..00000000 --- a/build/Dockerfile.x86_64-pc-windows-gnu +++ /dev/null @@ -1,3 +0,0 @@ -FROM rustembedded/cross:x86_64-pc-windows-gnu - -ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3" diff --git a/build/Dockerfile.x86_64-unknown-linux-gnu b/build/Dockerfile.x86_64-unknown-linux-gnu deleted file mode 100644 index a1bca71e..00000000 --- a/build/Dockerfile.x86_64-unknown-linux-gnu +++ /dev/null @@ -1,3 +0,0 @@ -FROM rustembedded/cross:x86_64-unknown-linux-gnu - -ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3" diff --git a/build/Dockerfile.x86_64-unknown-linux-musl b/build/Dockerfile.x86_64-unknown-linux-musl deleted file mode 100644 index e5f9768c..00000000 --- a/build/Dockerfile.x86_64-unknown-linux-musl +++ /dev/null @@ -1,3 +0,0 @@ -FROM rustembedded/cross:x86_64-unknown-linux-musl - -ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3"