Add cross.toml

jpochyla · Jul 6, 2024 · 47bf5f8 · 47bf5f8
1 parent 91055d2
commit 47bf5f8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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"