Skip to content

Commit 35bfe2e

Browse files
committed
Merge remote-tracking branch 'origin/feat/build-native' into feat/build-native
2 parents b411c6e + 2e48327 commit 35bfe2e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ jobs:
226226
- uses: actions/checkout@v4
227227
with:
228228
path: checkout
229+
submodules: recursive
229230

230231
- name: Extract package to ${{ matrix.app }}/Plugins
231232
run: unzip sentry-unreal-*-engine${{ matrix.unreal }}-github.zip -d checkout/${{ matrix.app }}/Plugins/sentry
@@ -237,6 +238,8 @@ jobs:
237238
- name: Run tests
238239
id: run-tests
239240
run: |
241+
docker exec -w /workspace/checkout/${{ matrix.app }} unreal bash -c "
242+
ls -al /workspace/checkout/${{ matrix.app }}/Plugins/sentry "
240243
docker exec -w /workspace/checkout/${{ matrix.app }} unreal /home/ue4/UnrealEngine/Engine/Build/BatchFiles/RunUAT.sh BuildCookRun \
241244
-project=/workspace/checkout/${{ matrix.app }}/SentryPlayground.uproject \
242245
-archivedirectory=/workspace/checkout/${{ matrix.app }}/Builds \

plugin-dev/Source/Sentry/Sentry.Build.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public bool Load(ReadOnlyTargetRules target, ModuleRules rules)
115115

116116
m_cmakeTargetPath=Path.GetFullPath(rules.Target.ProjectFile.FullName);
117117
Console.WriteLine("Loading cmake path=: "+Directory .GetParent(m_cmakeTargetPath).FullName);
118-
m_cmakeTargetPath=Directory .GetParent(m_cmakeTargetPath).FullName+"/Plugins/Sentry/sentry-native";
118+
m_cmakeTargetPath=Directory .GetParent(m_cmakeTargetPath).FullName+"/Plugins/sentry/sentry-native";
119119

120120
m_modulePath=Path.GetFullPath(rules.ModuleDirectory);
121121
m_targetPath=Path.Combine(m_modulePath, m_targetLocation);
@@ -544,7 +544,7 @@ public Sentry(ReadOnlyTargetRules Target) : base(Target)
544544
if (PublicDefinitions.Contains("USE_SENTRY_NATIVE=1"))
545545
{
546546
var cmakeTargetPath = Path.GetFullPath(Target.ProjectFile.FullName);
547-
var targetLocation = Directory.GetParent(cmakeTargetPath).FullName + "/Plugins/Sentry/sentry-native";
547+
var targetLocation = Directory.GetParent(cmakeTargetPath).FullName + "/Plugins/sentry/sentry-native";
548548

549549
CMakeTargetInst cmakeTarget =
550550
new CMakeTargetInst("sentry-native", Target.Platform.ToString(), targetLocation, "");

0 commit comments

Comments
 (0)