From d4e311650201a1fe8c38fdd81f9cb7c434b7d103 Mon Sep 17 00:00:00 2001 From: Ivan Tustanivskyi Date: Thu, 19 Dec 2024 11:22:17 +0200 Subject: [PATCH 1/3] Fix CI pipeline breakage due to invalid large GitHub runner `uid` (#718) * Check log folder content * Fix * Fix * Fix user Id * Add HOME env variable * Try remove custom user * Try ue4 user * Try without user again * Add gh user * Try address permission issues * Another one --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e4d6eee..b61e51f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -187,10 +187,13 @@ jobs: --volume ${{ github.workspace }}:/workspace \ --workdir /workspace \ --user $uid:$gid \ + --env HOME="/home/$user" \ --env PATH="/home/$user/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ --network ip6net -p 80:80 \ ghcr.io/epicgames/unreal-engine:dev-slim-${{ matrix.unreal }}.1 docker logout ghcr.io + # Add the user so it has a home directory (needed to run tests later on) + docker exec --user root unreal useradd -u $uid -g $gid --create-home $user # Ensure CA certs are in the right directory (needed for running tests) docker exec --user root unreal bash -c " mkdir -p /etc/pki/tls/certs ; @@ -203,7 +206,9 @@ jobs: uid=$(id -u) # the GH action user ID docker exec --user root unreal bash -c " chown -R $uid /home/ue4/UnrealEngine/Engine/Binaries/ThirdParty/Mono/Linux ; - chown -R $uid /home/ue4/UnrealEngine/Engine/${{ matrix.unreal == '4.27' && 'Programs/UnrealPak/Saved' || 'Binaries/ThirdParty/DotNet' }} " + chown -R $uid /home/ue4/UnrealEngine/Engine/${{ matrix.unreal == '4.27' && 'Programs/UnrealPak/Saved' || 'Binaries/ThirdParty/DotNet' }} ; + mkdir -p /home/ue4/UnrealEngine/Epic/UnrealEngine && chown -R $uid /home/ue4/UnrealEngine/Epic ; + mkdir -p /home/ue4/UnrealEngine/Engine/Source/Epic/UnrealEngine && chown -R $uid /home/ue4/UnrealEngine/Engine/Source/Epic " - name: Setup C++ runtime run: docker exec --user root unreal bash -c ' @@ -242,7 +247,7 @@ jobs: -package \ -archive docker exec -w /workspace/checkout/${{ matrix.app }} unreal bash -c " - cp -r '/home/ue4/Library/Logs/Unreal Engine/LocalBuildLogs' Saved/Logs " + cp -r '/home/gh/Library/Logs/Unreal Engine/LocalBuildLogs' Saved/Logs " docker exec -w /workspace/checkout/${{ matrix.app }} unreal /home/ue4/UnrealEngine/Engine/Binaries/Linux/${{ matrix.unreal == '4.27' && 'UE4Editor' || 'UnrealEditor' }} \ /workspace/checkout/${{ matrix.app }}/SentryPlayground.uproject \ -ReportExportPath=/workspace/checkout/${{ matrix.app }}/Saved/Automation \ From f1fbf3eb7eeda2457dc39cbdd32ff52d21c0f562 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 14:20:32 +0200 Subject: [PATCH 2/3] chore: update modules/sentry-native to 0.7.17 (#717) Co-authored-by: GitHub --- CHANGELOG.md | 8 ++++++++ modules/sentry-native | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa1b0a70..3b598fac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## Unreleased + +### Dependencies + +- Bump Native SDK from v0.7.16 to v0.7.17 ([#717](https://github.com/getsentry/sentry-unreal/pull/717)) + - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0717) + - [diff](https://github.com/getsentry/sentry-native/compare/0.7.16...0.7.17) + ## 0.21.1 ### Fixes diff --git a/modules/sentry-native b/modules/sentry-native index 39445fe2..4072538d 160000 --- a/modules/sentry-native +++ b/modules/sentry-native @@ -1 +1 @@ -Subproject commit 39445fe2512a83e6e8f8e031a64e0c5d90457263 +Subproject commit 4072538dfdbcafb3974318fe08798e51f62786d9 From 6f7863ac571c53b5e474a6873bdf204708753f7d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:41:37 +0200 Subject: [PATCH 3/3] chore: update modules/sentry-java to 7.19.0 (#709) Co-authored-by: GitHub --- CHANGELOG.md | 3 +++ modules/sentry-java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b598fac..25d07082 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ - Bump Native SDK from v0.7.16 to v0.7.17 ([#717](https://github.com/getsentry/sentry-unreal/pull/717)) - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0717) - [diff](https://github.com/getsentry/sentry-native/compare/0.7.16...0.7.17) +- Bump Java SDK (Android) from v7.18.1 to v7.19.0 ([#709](https://github.com/getsentry/sentry-unreal/pull/709)) + - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7190) + - [diff](https://github.com/getsentry/sentry-java/compare/7.18.1...7.19.0) ## 0.21.1 diff --git a/modules/sentry-java b/modules/sentry-java index 34422b4f..a03dcf08 160000 --- a/modules/sentry-java +++ b/modules/sentry-java @@ -1 +1 @@ -Subproject commit 34422b4f112b06789d95ff74236cbf8a986ea293 +Subproject commit a03dcf082ccd85402391c8384fb1a1a881961773