From 2fafc92ebe326f1052e1418dbb7a8600f84df283 Mon Sep 17 00:00:00 2001
From: Riccardo Busetti <riccardob36@gmail.com>
Date: Tue, 7 Jan 2025 15:42:31 +0100
Subject: [PATCH] feat(ci): Remove cross compilation in CI, update
 sentry-native (#4427)

---
 .github/workflows/ci.yml  | 27 ++++++++++++++-------------
 CHANGELOG.md              |  1 +
 relay-crash/sentry-native |  2 +-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0edc3f4243..9fa9047987 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -225,7 +225,11 @@ jobs:
         target: ${{ fromJson(needs.build-setup.outputs.targets) }}
 
     name: Build Relay Binary
-    runs-on: ubuntu-latest
+    runs-on: |-
+      ${{fromJson('{
+        "x86_64-unknown-linux-gnu": "ubuntu-20.04",
+        "aarch64-unknown-linux-gnu": "ubuntu-22.04-arm64-relay"
+      }')[matrix.target] }}
 
     if: "!startsWith(github.ref, 'refs/heads/release-library/')"
 
@@ -241,13 +245,16 @@ jobs:
           "x86_64-unknown-linux-gnu": "linux/amd64",
           "aarch64-unknown-linux-gnu": "linux/arm64"
         }')[matrix.target] }}
-      # Fix editor: '
 
     steps:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y llvm
+          sudo apt-get install -y llvm curl
+
+      - name: Install sentry-cli
+        run: |
+          curl -sL https://sentry.io/get-cli/ | bash
 
       - uses: actions/checkout@v4
         with:
@@ -258,15 +265,9 @@ jobs:
         with:
           key: "${{ github.job }}-${{ matrix.target }}-${{ matrix.image_name }}"
 
-      - name: Install Cross
-        # We need a nightly version of cross for `cross-util`.
-        run: cargo install cross --git https://github.com/cross-rs/cross --rev 085092c
-
       - name: Compile
         run: |
-          export PATH="/home/runner/.cargo/bin/:$PATH"
-
-          cross build --release --locked --features "${FEATURES}" --target "${{ matrix.target }}"
+          cargo build --release --locked --features "${FEATURES}" --target "${{ matrix.target }}"
 
       - name: Split debug info
         run: |
@@ -274,7 +275,7 @@ jobs:
           llvm-objcopy --strip-debug --strip-unneeded "${RELAY_BIN}"
           llvm-objcopy --add-gnu-debuglink "${RELAY_BIN}"{.debug,}
 
-          cross-util run --target "${{ matrix.target }}" -- "sentry-cli difutil bundle-sources ${RELAY_BIN}.debug"
+          sentry-cli difutil bundle-sources "${RELAY_BIN}.debug"
           zip "${RELAY_BIN}-debug.zip" "${RELAY_BIN}.debug"
 
       - name: Prepare Artifacts
@@ -301,7 +302,7 @@ jobs:
         image_name: ${{ fromJson(needs.build-setup.outputs.image_names) }}
 
     env:
-      PLATFORMS: "${{ join(fromJSON(needs.build-setup.outputs.platforms), ',') }}"
+      PLATFORMS: "${{ join(fromJson(needs.build-setup.outputs.platforms), ',') }}"
       DOCKER_IMAGE: "ghcr.io/getsentry/${{ matrix.image_name }}"
       REVISION: "${{ github.event.pull_request.head.sha || github.sha }}"
 
@@ -355,7 +356,7 @@ jobs:
 
     strategy:
       matrix:
-        image_name: [relay] # Don't publish relay-pop (for now)
+        image_name: ["relay"] # Don't publish relay-pop (for now)
 
     if: ${{ (github.ref_name == 'master') }}
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35c0d1e8f5..4b6cadba93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 **Internal**:
 
 - Remove the `spool` command from Relay. ([#4423](https://github.com/getsentry/relay/pull/4423))
+- Bump `sentry-native` to `0.7.17` and remove cross compilation in CI. ([#4427](https://github.com/getsentry/relay/pull/4427))
 
 ## 24.12.1
 
diff --git a/relay-crash/sentry-native b/relay-crash/sentry-native
index d380374c32..4072538dfd 160000
--- a/relay-crash/sentry-native
+++ b/relay-crash/sentry-native
@@ -1 +1 @@
-Subproject commit d380374c32d58f75b16758217338ec9cc9aa5b9e
+Subproject commit 4072538dfdbcafb3974318fe08798e51f62786d9