From 36b07626579809107a560aa31b33c9230a9c18cc Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Wed, 25 May 2022 14:40:11 -0400 Subject: [PATCH] try arm container approach instead... --- .github/workflows/ci.yml | 1 + .github/workflows/deployment.yml | 11 +++++------ .github/workflows/nightly.yml | 11 +++++------ Cross.toml | 6 ------ deployment/cargo_deb.sh | 3 --- .../docker/aarch64-unknown-linux-gnu/Dockerfile | 4 ---- deployment/docker/aarch64-unknown-linux-gnu/build | 5 ----- .../docker/arm-unknown-linux-gnueabihf/Dockerfile | 4 ---- deployment/docker/arm-unknown-linux-gnueabihf/build | 5 ----- 9 files changed, 11 insertions(+), 39 deletions(-) delete mode 100755 deployment/cargo_deb.sh delete mode 100644 deployment/docker/aarch64-unknown-linux-gnu/Dockerfile delete mode 100644 deployment/docker/aarch64-unknown-linux-gnu/build delete mode 100644 deployment/docker/arm-unknown-linux-gnueabihf/Dockerfile delete mode 100644 deployment/docker/arm-unknown-linux-gnueabihf/build diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a4fc825c..859561270 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,7 @@ # CI pipeline based on: # - https://github.com/heim-rs/heim/blob/master/.github/workflows/ci.yml # - https://github.com/BurntSushi/ripgrep/blob/master/.github/workflows/ci.yml +# - https://www.reillywood.com/blog/rust-faster-ci/ # # CI pipeline should do: # - cargo fmt on supported platforms diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 0c463faef..46046dadf 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -285,6 +285,7 @@ jobs: name: build-deb needs: [initialize-release-job] runs-on: ${{ matrix.triple.os }} + container: ${{ matrix.triple.container }} strategy: fail-fast: false matrix: @@ -292,20 +293,19 @@ jobs: - { os: "ubuntu-latest", target: "x86_64-unknown-linux-gnu", - cross: false, name: "amd64", } - { os: "ubuntu-latest", - target: "arm-unknown-linux-gnueabihf", - cross: true, - name: "arm", + target: "armv7-unknown-linux-gnueabihf", + name: "armv7", + container: "arm32v7/ubuntu", } - { os: "ubuntu-latest", target: "aarch64-unknown-linux-gnu", - cross: true, name: "aarch64", + container: "arm64v8/ubuntu", } env: RUST_BACKTRACE: 1 @@ -347,7 +347,6 @@ jobs: with: command: build args: --release --locked --verbose --target=${{ matrix.triple.target }} --features deploy - use-cross: ${{ matrix.triple.cross }} env: RUST_BACKTRACE: 1 BTM_GENERATE_COMPLETIONS: true diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 054091115..65d96f1b3 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -279,6 +279,7 @@ jobs: name: build-deb needs: [initialize-job] runs-on: ${{ matrix.triple.os }} + container: ${{ matrix.triple.container }} strategy: fail-fast: false matrix: @@ -286,20 +287,19 @@ jobs: - { os: "ubuntu-latest", target: "x86_64-unknown-linux-gnu", - cross: false, name: "amd64", } - { os: "ubuntu-latest", - target: "arm-unknown-linux-gnueabihf", - cross: true, - name: "arm", + target: "armv7-unknown-linux-gnueabihf", + name: "armv7", + container: "arm32v7/ubuntu", } - { os: "ubuntu-latest", target: "aarch64-unknown-linux-gnu", - cross: true, name: "aarch64", + container: "arm64v8/ubuntu", } env: RUST_BACKTRACE: 1 @@ -341,7 +341,6 @@ jobs: with: command: build args: --release --locked --verbose --target=${{ matrix.triple.target }} --features deploy - use-cross: ${{ matrix.triple.cross }} env: RUST_BACKTRACE: 1 BTM_GENERATE_COMPLETIONS: true diff --git a/Cross.toml b/Cross.toml index 65a56034e..163c644d3 100644 --- a/Cross.toml +++ b/Cross.toml @@ -1,8 +1,2 @@ [build.env] passthrough = ["RUST_BACKTRACE", "BTM_GENERATE_COMPLETIONS"] - -[target.arm-unknown-linux-gnueabihf] -image = "clementtsang/cross:arm-unknown-linux-gnueabihf" - -[target.aarch64-unknown-linux-gnu] -image = "clementtsang/cross:aarch64-unknown-linux-gnu" diff --git a/deployment/cargo_deb.sh b/deployment/cargo_deb.sh deleted file mode 100755 index 114662f8c..000000000 --- a/deployment/cargo_deb.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -cargo install cargo-deb --version 1.37.0 --locked \ No newline at end of file diff --git a/deployment/docker/aarch64-unknown-linux-gnu/Dockerfile b/deployment/docker/aarch64-unknown-linux-gnu/Dockerfile deleted file mode 100644 index e017d610a..000000000 --- a/deployment/docker/aarch64-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM rustembedded/cross:aarch64-unknown-linux-gnu - -COPY stage/cargo_deb.sh / -RUN /cargo_deb.sh \ No newline at end of file diff --git a/deployment/docker/aarch64-unknown-linux-gnu/build b/deployment/docker/aarch64-unknown-linux-gnu/build deleted file mode 100644 index 0b3a43c5c..000000000 --- a/deployment/docker/aarch64-unknown-linux-gnu/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -mkdir -p stage -cp ../../cargo_deb.sh ./stage/ -docker build -t clementtsang/cross:arm-unknown-linux-gnueabihf . \ No newline at end of file diff --git a/deployment/docker/arm-unknown-linux-gnueabihf/Dockerfile b/deployment/docker/arm-unknown-linux-gnueabihf/Dockerfile deleted file mode 100644 index 08e7838d6..000000000 --- a/deployment/docker/arm-unknown-linux-gnueabihf/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM rustembedded/cross:arm-unknown-linux-gnueabihf - -COPY stage/cargo_deb.sh / -RUN /cargo_deb.sh \ No newline at end of file diff --git a/deployment/docker/arm-unknown-linux-gnueabihf/build b/deployment/docker/arm-unknown-linux-gnueabihf/build deleted file mode 100644 index 0b3a43c5c..000000000 --- a/deployment/docker/arm-unknown-linux-gnueabihf/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -mkdir -p stage -cp ../../cargo_deb.sh ./stage/ -docker build -t clementtsang/cross:arm-unknown-linux-gnueabihf . \ No newline at end of file