From 44d826e6e379ba5ca1bf0743c1a62558c5bc615c Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Wed, 16 Apr 2025 17:35:26 +0200
Subject: [PATCH 1/2] fix: use ubuntu-20.04 container

---
 .github/workflows/ci.yml   |  4 +++-
 .github/workflows/sdk.yml  | 38 ++++++++++++++++++++++++++++++++++----
 Directory.Build.targets    | 10 +---------
 scripts/build-linux-sdk.sh | 21 +++++++++++++++++++++
 4 files changed, 59 insertions(+), 14 deletions(-)
 create mode 100755 scripts/build-linux-sdk.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 49c323c6b..f8fab3b0f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,15 +32,17 @@ jobs:
           - target: Android
             host: ubuntu-latest
           - target: Linux
+            host: ubuntu-latest
             # Build using older Linux version to preserve sdk compatibility with old GLIBC
             # See discussion in https://github.com/getsentry/sentry-unity/issues/1730 for more details
-            host: ubuntu-20.04
+            container: ubuntu:20.04
           - target: Windows
             host: windows-latest
     uses: ./.github/workflows/sdk.yml
     with:
       target: ${{ matrix.target }}
       runsOn: ${{ matrix.host }}
+      container: ${{ matrix.container }}
 
   build-unity-sdk:
     name: Build Unity SDK
diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
index a63d11880..5e0ef05df 100644
--- a/.github/workflows/sdk.yml
+++ b/.github/workflows/sdk.yml
@@ -7,6 +7,10 @@ on:
       target:
         required: true
         type: string
+      container:
+        required: false
+        type: string
+        default: ''
 
 env:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -15,8 +19,26 @@ env:
 jobs:
   build:
     runs-on: ${{ inputs.runsOn }}
+    container: ${{ inputs.container }}
     timeout-minutes: 30
     steps:
+      - name: Set up Git in container
+        if: ${{ inputs.container != '' }}
+        # ubuntu:20.04 does not have git installed by default. Make it available
+        # for actions/checkout to get a proper clone instead of downloading a
+        # tarball using the GitHub REST API. This ensures that git submodule
+        # commands work as expected.
+        #
+        # Furthermore, add an exception for the workspace directory to avoid the
+        # following git error (runner host vs. container):
+        # fatal: detected dubious ownership in repository at '/__w/sentry-unity/sentry-unity'
+        run: |
+          apt-get update
+          apt-get install -y git
+          git config --global --add safe.directory $GITHUB_WORKSPACE
+        env:
+          DEBIAN_FRONTEND: noninteractive
+
       - uses: actions/checkout@v3
 
       - name: Select submodules
@@ -52,11 +74,19 @@ jobs:
       - name: Installing Linux Dependencies
         if: ${{ inputs.target == 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
         run: |
-          sudo apt-get update
-          sudo apt-get install zlib1g-dev libcurl4-openssl-dev libssl-dev
+          apt-get update
+          apt-get install -y zlib1g-dev libcurl4-openssl-dev libssl-dev build-essential cmake
+        env:
+          DEBIAN_FRONTEND: noninteractive
+
+      - name: Build for Linux
+        if: ${{ inputs.target == 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
+        run: |
+          git submodule update --init --recursive ${{ steps.env.outputs.submodules }}
+          ./scripts/build-linux-sdk.sh modules/sentry-native package-dev/Plugins/Linux/Sentry
 
-      - name: Build
-        if: steps.cache.outputs.cache-hit != 'true'
+      - name: Run MSBuild
+        if: ${{ inputs.target != 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
         run: |
           git submodule update --init --recursive ${{ steps.env.outputs.submodules }}
           dotnet msbuild /t:Build${{ inputs.target }}SDK /p:Configuration=Release /p:OutDir=other src/Sentry.Unity
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 2e8431a21..ca9d4d603 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -307,15 +307,7 @@ Expected to exist:
 
     <Message Importance="High" Text="Building artifacts of Sentry Native SDK for Linux." />
 
-    <Exec WorkingDirectory="$(SentryNativeRoot)" Command="cmake -B build -D SENTRY_BACKEND=breakpad -D SENTRY_SDK_NAME=sentry.native.unity -D CMAKE_BUILD_TYPE=RelWithDebInfo -S ." />
-    <Exec WorkingDirectory="$(SentryNativeRoot)" Command="cmake --build build --target sentry --parallel" />
-
-    <MakeDir Directories="$(SentryLinuxArtifactsDestination)"/>
-
-    <!-- strip all, including exported symbols except those starting with 'sentry_', except for 'sentry__' -->
-    <Exec WorkingDirectory="$(SentryNativeRoot)" Command="strip -s build/libsentry.so -w -K sentry_[^_]* -o $(SentryLinuxArtifactsDestination)libsentry.so" />
-    <Exec WorkingDirectory="$(SentryNativeRoot)" Command="cp build/libsentry.so $(SentryLinuxArtifactsDestination)libsentry.dbg.so" />
-    <Exec WorkingDirectory="$(SentryLinuxArtifactsDestination)" Command="objcopy --add-gnu-debuglink=libsentry.dbg.so libsentry.so" />
+    <Exec Command="bash &quot;$(RepoRoot)scripts/build-linux-sdk.sh&quot; &quot;$(SentryNativeRoot)&quot; &quot;$(SentryLinuxArtifactsDestination)&quot;"></Exec>
   </Target>
 
   <!-- Even with a successful build, Unity will error on 'usbmuxd' or log out to std-error which breaks msbuild.
diff --git a/scripts/build-linux-sdk.sh b/scripts/build-linux-sdk.sh
new file mode 100755
index 000000000..60bcfc758
--- /dev/null
+++ b/scripts/build-linux-sdk.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+
+if [ "$#" -ne 2 ]; then
+    echo "Usage: $0 <path/to/sentry-native> <path/to/artifacts>"
+    exit 1
+fi
+
+sentry_native_root=$(realpath "$1")
+sentry_native_build="$sentry_native_root/build"
+sentry_linux_artifacts_destination=$(realpath "$2")
+
+cmake -B "$sentry_native_build" -D SENTRY_BACKEND=breakpad -D SENTRY_SDK_NAME=sentry.native.unity -D CMAKE_BUILD_TYPE=RelWithDebInfo -S "$sentry_native_root"
+cmake --build "$sentry_native_build" --target sentry --parallel
+
+mkdir -p "$sentry_linux_artifacts_destination"
+
+# strip all, including exported symbols except those starting with 'sentry_', except for 'sentry__'
+strip -s "$sentry_native_build/libsentry.so" -w -K sentry_[^_]* -o "$sentry_linux_artifacts_destination/libsentry.so"
+cp "$sentry_native_build/libsentry.so" "$sentry_linux_artifacts_destination/libsentry.dbg.so"
+objcopy --add-gnu-debuglink="$sentry_linux_artifacts_destination/libsentry.dbg.so" "$sentry_linux_artifacts_destination/libsentry.so"

From 27606b6c291d9313792478a1c4564cb839cfbbf1 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Thu, 17 Apr 2025 12:29:32 +0200
Subject: [PATCH 2/2] Switch to dotnet-install.sh

---
 .github/workflows/ci.yml   |  2 +-
 .github/workflows/sdk.yml  | 14 +++++---------
 Directory.Build.targets    | 10 +++++++++-
 scripts/build-linux-sdk.sh | 21 ---------------------
 4 files changed, 15 insertions(+), 32 deletions(-)
 delete mode 100755 scripts/build-linux-sdk.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f8fab3b0f..58939b7fc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,10 +32,10 @@ jobs:
           - target: Android
             host: ubuntu-latest
           - target: Linux
-            host: ubuntu-latest
             # Build using older Linux version to preserve sdk compatibility with old GLIBC
             # See discussion in https://github.com/getsentry/sentry-unity/issues/1730 for more details
             container: ubuntu:20.04
+            host: ubuntu-latest
           - target: Windows
             host: windows-latest
     uses: ./.github/workflows/sdk.yml
diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
index 5e0ef05df..9c7d01c61 100644
--- a/.github/workflows/sdk.yml
+++ b/.github/workflows/sdk.yml
@@ -75,18 +75,14 @@ jobs:
         if: ${{ inputs.target == 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
         run: |
           apt-get update
-          apt-get install -y zlib1g-dev libcurl4-openssl-dev libssl-dev build-essential cmake
+          apt-get install -y zlib1g-dev libcurl4-openssl-dev libssl-dev build-essential cmake curl
+          curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 9.0 --install-dir /usr/share/dotnet
+          echo "/usr/share/dotnet" >> $GITHUB_PATH
         env:
           DEBIAN_FRONTEND: noninteractive
 
-      - name: Build for Linux
-        if: ${{ inputs.target == 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
-        run: |
-          git submodule update --init --recursive ${{ steps.env.outputs.submodules }}
-          ./scripts/build-linux-sdk.sh modules/sentry-native package-dev/Plugins/Linux/Sentry
-
-      - name: Run MSBuild
-        if: ${{ inputs.target != 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
+      - name: Build
+        if: steps.cache.outputs.cache-hit != 'true'
         run: |
           git submodule update --init --recursive ${{ steps.env.outputs.submodules }}
           dotnet msbuild /t:Build${{ inputs.target }}SDK /p:Configuration=Release /p:OutDir=other src/Sentry.Unity
diff --git a/Directory.Build.targets b/Directory.Build.targets
index ca9d4d603..2e8431a21 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -307,7 +307,15 @@ Expected to exist:
 
     <Message Importance="High" Text="Building artifacts of Sentry Native SDK for Linux." />
 
-    <Exec Command="bash &quot;$(RepoRoot)scripts/build-linux-sdk.sh&quot; &quot;$(SentryNativeRoot)&quot; &quot;$(SentryLinuxArtifactsDestination)&quot;"></Exec>
+    <Exec WorkingDirectory="$(SentryNativeRoot)" Command="cmake -B build -D SENTRY_BACKEND=breakpad -D SENTRY_SDK_NAME=sentry.native.unity -D CMAKE_BUILD_TYPE=RelWithDebInfo -S ." />
+    <Exec WorkingDirectory="$(SentryNativeRoot)" Command="cmake --build build --target sentry --parallel" />
+
+    <MakeDir Directories="$(SentryLinuxArtifactsDestination)"/>
+
+    <!-- strip all, including exported symbols except those starting with 'sentry_', except for 'sentry__' -->
+    <Exec WorkingDirectory="$(SentryNativeRoot)" Command="strip -s build/libsentry.so -w -K sentry_[^_]* -o $(SentryLinuxArtifactsDestination)libsentry.so" />
+    <Exec WorkingDirectory="$(SentryNativeRoot)" Command="cp build/libsentry.so $(SentryLinuxArtifactsDestination)libsentry.dbg.so" />
+    <Exec WorkingDirectory="$(SentryLinuxArtifactsDestination)" Command="objcopy --add-gnu-debuglink=libsentry.dbg.so libsentry.so" />
   </Target>
 
   <!-- Even with a successful build, Unity will error on 'usbmuxd' or log out to std-error which breaks msbuild.
diff --git a/scripts/build-linux-sdk.sh b/scripts/build-linux-sdk.sh
deleted file mode 100755
index 60bcfc758..000000000
--- a/scripts/build-linux-sdk.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-set -e
-
-if [ "$#" -ne 2 ]; then
-    echo "Usage: $0 <path/to/sentry-native> <path/to/artifacts>"
-    exit 1
-fi
-
-sentry_native_root=$(realpath "$1")
-sentry_native_build="$sentry_native_root/build"
-sentry_linux_artifacts_destination=$(realpath "$2")
-
-cmake -B "$sentry_native_build" -D SENTRY_BACKEND=breakpad -D SENTRY_SDK_NAME=sentry.native.unity -D CMAKE_BUILD_TYPE=RelWithDebInfo -S "$sentry_native_root"
-cmake --build "$sentry_native_build" --target sentry --parallel
-
-mkdir -p "$sentry_linux_artifacts_destination"
-
-# strip all, including exported symbols except those starting with 'sentry_', except for 'sentry__'
-strip -s "$sentry_native_build/libsentry.so" -w -K sentry_[^_]* -o "$sentry_linux_artifacts_destination/libsentry.so"
-cp "$sentry_native_build/libsentry.so" "$sentry_linux_artifacts_destination/libsentry.dbg.so"
-objcopy --add-gnu-debuglink="$sentry_linux_artifacts_destination/libsentry.dbg.so" "$sentry_linux_artifacts_destination/libsentry.so"