From 8d1e7fc9ddbca720096c1512b30372c4f0a64551 Mon Sep 17 00:00:00 2001
From: Arthur Pastel <arthur.pastel@gmail.com>
Date: Fri, 6 Sep 2024 22:49:26 +0200
Subject: [PATCH] --wip-- [with ci]

---
 .github/workflows/ci.yml            | 10 +++-------
 .github/workflows/release.yml       | 10 +++-------
 crates/cargo-codspeed/.cargo/config |  2 --
 3 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 crates/cargo-codspeed/.cargo/config

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 22a4b80..01dd060 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,8 +66,7 @@ jobs:
         include:
           - target: x86_64-unknown-linux-gnu
           - target: aarch64-unknown-linux-gnu
-            setup: |
-              sudo apt-get install -y gcc-aarch64-linux-gnu
+            cross: true
 
     runs-on: ubuntu-latest
     steps:
@@ -76,9 +75,6 @@ jobs:
         with:
           targets: ${{ matrix.target }}
           cache-target: ${{ matrix.target }}/release
+          bins: cross
 
-      - name: Setup environment for target
-        if: ${{ matrix.setup }}
-        run: ${{ matrix.setup }}
-
-      - run: cargo build --release --features vendored-openssl --bin cargo-codspeed --target ${{ matrix.target }}
+      - run: ${{ matrix.cross && 'cross' || 'cargo' }} build --locked --release --features vendored-openssl --bin cargo-codspeed --target ${{ matrix.target }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 95778f4..8a1618e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,8 +47,7 @@ jobs:
         include:
           - target: x86_64-unknown-linux-gnu
           - target: aarch64-unknown-linux-gnu
-            setup: |
-              sudo apt-get install -y gcc-aarch64-linux-gnu
+            cross: true
 
     runs-on: ubuntu-latest
     steps:
@@ -57,12 +56,9 @@ jobs:
         with:
           targets: ${{ matrix.target }}
           cache-target: ${{ matrix.target }}/release
+          bins: cross
 
-      - name: Setup environment for target
-        if: ${{ matrix.setup }}
-        run: ${{ matrix.setup }}
-
-      - run: cargo build --release --features vendored-openssl --bin cargo-codspeed --target ${{ matrix.target }}
+      - run: ${{ matrix.cross && 'cross' || 'cargo' }} build --locked --release --features vendored-openssl --bin cargo-codspeed --target ${{ matrix.target }}
 
       - name: Upload Release Asset
         id: upload-release-asset
diff --git a/crates/cargo-codspeed/.cargo/config b/crates/cargo-codspeed/.cargo/config
deleted file mode 100644
index ff7f758..0000000
--- a/crates/cargo-codspeed/.cargo/config
+++ /dev/null
@@ -1,2 +0,0 @@
-[target.aarch64-unknown-linux-gnu]
-linker = "aarch64-linux-gnu-gcc"
\ No newline at end of file