Skip to content

Commit

Permalink
try arm container approach instead...
Browse files Browse the repository at this point in the history
  • Loading branch information
ClementTsang committed May 25, 2022
1 parent 0b37559 commit 36b0762
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 39 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -285,27 +285,27 @@ jobs:
name: build-deb
needs: [initialize-release-job]
runs-on: ${{ matrix.triple.os }}
container: ${{ matrix.triple.container }}
strategy:
fail-fast: false
matrix:
triple:
- {
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
Expand Down Expand Up @@ -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
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -279,27 +279,27 @@ jobs:
name: build-deb
needs: [initialize-job]
runs-on: ${{ matrix.triple.os }}
container: ${{ matrix.triple.container }}
strategy:
fail-fast: false
matrix:
triple:
- {
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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 0 additions & 3 deletions deployment/cargo_deb.sh

This file was deleted.

4 changes: 0 additions & 4 deletions deployment/docker/aarch64-unknown-linux-gnu/Dockerfile

This file was deleted.

5 changes: 0 additions & 5 deletions deployment/docker/aarch64-unknown-linux-gnu/build

This file was deleted.

4 changes: 0 additions & 4 deletions deployment/docker/arm-unknown-linux-gnueabihf/Dockerfile

This file was deleted.

5 changes: 0 additions & 5 deletions deployment/docker/arm-unknown-linux-gnueabihf/build

This file was deleted.

0 comments on commit 36b0762

Please sign in to comment.