From 47bf5f8f755e8b09b549bb344900a35d2023e4bd Mon Sep 17 00:00:00 2001 From: Jackson Goode Date: Sat, 6 Jul 2024 14:09:19 -0700 Subject: [PATCH] Add cross.toml --- .github/workflows/build.yml | 6 +----- Cargo.toml | 10 ---------- Cross.toml | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 Cross.toml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aea0fb71..fce403a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,11 +56,7 @@ jobs: - name: Build (Linux) if: runner.os == 'Linux' - uses: clechasseur/rs-cargo@v2 - with: - use-cross: true - command: build - args: --release --target ${{ matrix.target }} + run: cross build --release --target ${{ matrix.target }} - name: Build Release (macOS) if: runner.os == 'macOS' diff --git a/Cargo.toml b/Cargo.toml index cc5cb954..235f3777 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,13 +13,3 @@ opt-level = 2 [profile.dev.package.libsamplerate] opt-level = 2 - -[workspace.metadata.cross.target] -image = "ghcr.io/cross-rs/{{TARGET}}:edge" -pre-build = [""" - dpkg --add-architecture $CROSS_DEB_ARCH && \ - apt-get update && apt-get --assume-yes install \ - libgtk-3-dev:$CROSS_DEB_ARCH \ - libssl-dev:$CROSS_DEB_ARCH \ - libasound2-dev:$CROSS_DEB_ARCH - """] diff --git a/Cross.toml b/Cross.toml new file mode 100644 index 00000000..f98ce5af --- /dev/null +++ b/Cross.toml @@ -0,0 +1,14 @@ +[build] +pre-build = [""" + dpkg --add-architecture $CROSS_DEB_ARCH && \ + apt-get update && apt-get --assume-yes install \ + libgtk-3-dev:$CROSS_DEB_ARCH \ + libssl-dev:$CROSS_DEB_ARCH \ + libasound2-dev:$CROSS_DEB_ARCH +"""] + +[target.x86_64-unknown-linux-gnu] +image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:edge" + +[target.aarch64-unknown-linux-gnu] +image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:edge"