From 385fe4b75f5aeedb97c9f3218d1ae487270c5430 Mon Sep 17 00:00:00 2001 From: GitHub Date: Wed, 12 Feb 2025 03:03:22 +0000 Subject: [PATCH 1/3] chore: update modules/sentry-java to 8.1.0 --- CHANGELOG.md | 3 +++ modules/sentry-java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12ac84c2f..fa82d85ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,9 @@ - Bump .NET SDK from v5.0.1 to v5.1.0 ([#2005](https://github.com/getsentry/sentry-unity/pull/2005)) - [changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md#510) - [diff](https://github.com/getsentry/sentry-dotnet/compare/5.0.1...5.1.0) +- Bump Java SDK from v7.20.0 to v8.1.0 ([#2002](https://github.com/getsentry/sentry-unity/pull/2002)) + - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#810) + - [diff](https://github.com/getsentry/sentry-java/compare/7.20.0...8.1.0) ## 3.0.0-beta.1 diff --git a/modules/sentry-java b/modules/sentry-java index 2de45ebb0..c322afef5 160000 --- a/modules/sentry-java +++ b/modules/sentry-java @@ -1 +1 @@ -Subproject commit 2de45ebb088ed5802dcac00781cbaca7e54ed9d9 +Subproject commit c322afef5a90cd104404079eba064e31e73ca1b0 From fbd2cd61559dcdfd7d1e1234fa41ef0b6120b63e Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Wed, 12 Feb 2025 21:04:01 +0100 Subject: [PATCH 2/3] log sdk build output --- .github/workflows/sdk.yml | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml index 14b419a42..4e4d47ece 100644 --- a/.github/workflows/sdk.yml +++ b/.github/workflows/sdk.yml @@ -38,30 +38,35 @@ jobs: - run: cp -r package-dev/Plugins/${{ inputs.target }} sdk-static || echo "never mind, no files checked in..." shell: bash - - name: Restore from cache - uses: actions/cache@v3 - id: cache - with: - # Note: native SDKs are cached and only built if the respective 'package-dev/Plugins/' directories are empty. - # Output changes only depending on the git sha of the submodules - # hash of package/package.json for cache busting on release builds (version bump) - path: | - package-dev/Plugins - modules/sentry-java/sentry-android-ndk/build/intermediates/merged_native_libs/release/out/lib - key: sdk=${{ inputs.target }}-${{ hashFiles('submodules-status', 'package/package.json', 'Directory.Build.targets', 'sdk-static/**') }} + # - name: Restore from cache + # uses: actions/cache@v3 + # id: cache + # with: + # # Note: native SDKs are cached and only built if the respective 'package-dev/Plugins/' directories are empty. + # # Output changes only depending on the git sha of the submodules + # # hash of package/package.json for cache busting on release builds (version bump) + # path: | + # package-dev/Plugins + # modules/sentry-java/sentry-android-ndk/build/intermediates/merged_native_libs/release/out/lib + # key: sdk=${{ inputs.target }}-${{ hashFiles('submodules-status', 'package/package.json', 'Directory.Build.targets', 'sdk-static/**') }} - name: Installing Linux Dependencies - if: ${{ inputs.target == 'Linux' && steps.cache.outputs.cache-hit != 'true' }} + # 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 - name: Build - if: steps.cache.outputs.cache-hit != 'true' + # 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 + - name: List Android libraries + if: ${{ inputs.target == 'Android' }} + shell: bash + run: ls -R modules/sentry-java/sentry-android-ndk/build/intermediates/merged_native_libs/release/ + - name: Upload build logs on failure if: ${{ failure() }} uses: actions/upload-artifact@v4 From 8d8884eacfe86f98d751711b60b36282e38d1d31 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Wed, 12 Feb 2025 22:27:47 +0100 Subject: [PATCH 3/3] just build it pls --- .github/workflows/sdk.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml index 4e4d47ece..fa7242cbb 100644 --- a/.github/workflows/sdk.yml +++ b/.github/workflows/sdk.yml @@ -50,14 +50,13 @@ jobs: # modules/sentry-java/sentry-android-ndk/build/intermediates/merged_native_libs/release/out/lib # key: sdk=${{ inputs.target }}-${{ hashFiles('submodules-status', 'package/package.json', 'Directory.Build.targets', 'sdk-static/**') }} - - 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 + # - 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 - 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