From 3a5d5922fb9fd2c0876ea69a283d03d89946823e Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Wed, 30 Aug 2023 07:33:36 +1000 Subject: [PATCH 01/16] Add missing headers. --- .../CesiumRuntime/Private/CesiumSubLevelSwitcherComponent.cpp | 1 + Source/CesiumRuntime/Private/Tests/CesiumTestHelpers.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/CesiumRuntime/Private/CesiumSubLevelSwitcherComponent.cpp b/Source/CesiumRuntime/Private/CesiumSubLevelSwitcherComponent.cpp index 5e2955b33..ed83985c3 100644 --- a/Source/CesiumRuntime/Private/CesiumSubLevelSwitcherComponent.cpp +++ b/Source/CesiumRuntime/Private/CesiumSubLevelSwitcherComponent.cpp @@ -1,4 +1,5 @@ #include "CesiumSubLevelSwitcherComponent.h" +#include "CesiumRuntime.h" #include "CesiumSubLevelComponent.h" #include "Engine/LevelStreaming.h" #include "Engine/World.h" diff --git a/Source/CesiumRuntime/Private/Tests/CesiumTestHelpers.h b/Source/CesiumRuntime/Private/Tests/CesiumTestHelpers.h index ebbc79b0b..02becf9bb 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumTestHelpers.h +++ b/Source/CesiumRuntime/Private/Tests/CesiumTestHelpers.h @@ -2,6 +2,7 @@ #pragma once +#include "CesiumRuntime.h" #include "EngineUtils.h" #include "Kismet/GameplayStatics.h" #include "Misc/AutomationTest.h" @@ -15,7 +16,7 @@ class UWorld; namespace CesiumTestHelpers { -static UWorld* getGlobalWorldContext(); +UWorld* getGlobalWorldContext(); template void waitForImpl( From 813d9e4c81da5a070a2b831790990254a805e78e Mon Sep 17 00:00:00 2001 From: Brian L <130494071+csciguy8@users.noreply.github.com> Date: Wed, 30 Aug 2023 09:56:14 -0600 Subject: [PATCH 02/16] Update testWindows.yml --- .github/workflows/testWindows.yml | 85 ++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 25 deletions(-) diff --git a/.github/workflows/testWindows.yml b/.github/workflows/testWindows.yml index 7ed9ad681..3e61f36c9 100644 --- a/.github/workflows/testWindows.yml +++ b/.github/workflows/testWindows.yml @@ -61,48 +61,83 @@ jobs: dir Get-Content "CesiumForUnreal.uplugin" | select-string -pattern "EngineVersion" - name: Run Cesium tests - continue-on-error: true - timeout-minutes: 30 + timeout-minutes: 60 run: | cd "${{ inputs.unreal-binaries-path }}" ./UnrealEditor-Cmd.exe "$env:TESTS_PROJECT_ROOT/TestsProject.uproject" -execcmds="Automation RunTests Cesium.;quit" -nullrhi -unattended -nosplash -ReportExportPath="$env:TESTS_PROJECT_LOGS" - name: Display tests log + if: always() run: | cd "$env:TESTS_PROJECT_LOGS" dir Get-Content TestsProject.log - name: Display tests report + if: always() run: | cd "$env:TESTS_PROJECT_LOGS" Get-Content index.json - name: Evaluate tests results + if: always() run: | - $env:TEST_STATUS="Pending" - echo "test_status=$env:TEST_STATUS" >> $env:GITHUB_ENV - cd "$env:TESTS_PROJECT_LOGS" - # Define function to parse json recursively - function Parse-JsonRecursively($jsonObject) { - foreach ($property in $jsonObject.PSObject.Properties) { - $name = $property.Name - $value = $property.Value + $failedTests = "" + $succeededTests = "" + + function Parse-Test($jsonObject) { + $currTestName = "" + foreach ($property in $jsonObject.PSObject.Properties) { + $name = $property.Name + $value = $property.Value + + if($name -eq "fullTestPath") { + $currTestName = $value + } + + if($name -eq "state") { + if ($value -eq "Success") { + $global:succeededTests += $currTestName + "`n" + } + else { + $global:failedTests += $currTestName + "`n" + } + } + } + } + + function Parse-Json($jsonObject) { + foreach ($property in $jsonObject.PSObject.Properties) { + $name = $property.Name + $value = $property.Value - # If the property value is another object, call function recursively - if ($value -is [PSCustomObject]) { - Parse-JsonRecursively($value) - } - else { - # If "state:fail" entry is found in json, set failure state - if($name -eq "state" -and $value -eq "fail") { - $env:TEST_STATUS="Failure" - return - } - } - } + # If the property value is another object, call function recursively + if ($name -eq "tests" -and $value -is [System.Object[]]) { + for (($i = 0); $i -lt $value.Count; $i++) { + Parse-Test($value[$i]) + } + } + } } - $env:TEST_STATUS="Success" # Set status to success at start $json = Get-Content -Path 'index.json' | ConvertFrom-Json # Read in json - Parse-JsonRecursively -jsonObject $json # Parse json - echo "test_status=$env:TEST_STATUS" >> $env:GITHUB_ENV # Export result to github environment variables \ No newline at end of file + Parse-Json -jsonObject $json # Parse json + + echo " " + if ($failedTests.Length -eq 0) { + echo "All tests passed:" + echo "-----------------" + echo "$succeededTests" + + exit 0 + } + else { + echo "Passing tests:" + echo "--------------" + echo "$succeededTests" + + echo "FAILED tests:" + echo "-------------" + echo "$failedTests" + + exit -1 + } \ No newline at end of file From 1b915cb364f76b160970ce21f0cf5dabdf806cf0 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Thu, 31 Aug 2023 16:24:41 +1000 Subject: [PATCH 03/16] Upgrade to latest cesium-native. --- Source/CesiumRuntime/CesiumRuntime.Build.cs | 2 ++ extern/cesium-native | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/CesiumRuntime/CesiumRuntime.Build.cs b/Source/CesiumRuntime/CesiumRuntime.Build.cs index 9cbd2b379..d2b708b65 100644 --- a/Source/CesiumRuntime/CesiumRuntime.Build.cs +++ b/Source/CesiumRuntime/CesiumRuntime.Build.cs @@ -81,6 +81,8 @@ public CesiumRuntime(ReadOnlyTargetRules Target) : base(Target) string[] libs = new string[] { "async++", + "Cesium3DTiles", + "Cesium3DTilesReader", "Cesium3DTilesSelection", "CesiumAsync", "CesiumGeometry", diff --git a/extern/cesium-native b/extern/cesium-native index 172ac5ddc..da901d260 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit 172ac5ddcce602c8b268ad342639554dea2f6004 +Subproject commit da901d260eae9b0a802a396d11185a9fc24a711e From f0a281efc49752727c5ca28b16110b0e09531ac6 Mon Sep 17 00:00:00 2001 From: xuelongmu Date: Sun, 13 Aug 2023 11:20:06 -0400 Subject: [PATCH 04/16] Update developer setup documentation --- Documentation/developer-setup-windows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/developer-setup-windows.md b/Documentation/developer-setup-windows.md index d102ba9d3..f58aaa6e9 100644 --- a/Documentation/developer-setup-windows.md +++ b/Documentation/developer-setup-windows.md @@ -119,7 +119,7 @@ Or the debug version: ## CMake command-line for Android -To cross-compile Cesium Native for Android, ensure that you have [installed Android Studio and Android NDK, and configured ANDROID_NDK_ROOT](https://github.com/CesiumGS/cesium-unreal/blob/main/Documentation/developer-setup-windows.md#for-cross-compiling-android-on-windows). Then you will need to have Ninja installed. With [chocolatey](https://chocolatey.org/install), you can run: +To cross-compile Cesium Native for Android, ensure that you have [installed Android Studio and Android NDK, and configured ANDROID_NDK_ROOT](#for-cross-compiling-android-on-windows). Then you will need to have Ninja installed. With [chocolatey](https://chocolatey.org/install), you can run: choco install ninja From b7023c467264d84317e898e80ce03c9fca821f70 Mon Sep 17 00:00:00 2001 From: xuelongmu Date: Sun, 13 Aug 2023 11:21:47 -0400 Subject: [PATCH 05/16] Update developer-setup-windows.md --- Documentation/developer-setup-windows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/developer-setup-windows.md b/Documentation/developer-setup-windows.md index f58aaa6e9..b99ec69c1 100644 --- a/Documentation/developer-setup-windows.md +++ b/Documentation/developer-setup-windows.md @@ -119,7 +119,7 @@ Or the debug version: ## CMake command-line for Android -To cross-compile Cesium Native for Android, ensure that you have [installed Android Studio and Android NDK, and configured ANDROID_NDK_ROOT](#for-cross-compiling-android-on-windows). Then you will need to have Ninja installed. With [chocolatey](https://chocolatey.org/install), you can run: +To cross-compile Cesium Native for Android, ensure that you have [installed Android Studio and Android NDK, and configured ANDROID_NDK_ROOT](#to-cross-compile-android-on-windows). Then you will need to have Ninja installed. With [chocolatey](https://chocolatey.org/install), you can run: choco install ninja From e58ecd817878ff928a0cb673484000ee170b56c5 Mon Sep 17 00:00:00 2001 From: Brian L <130494071+csciguy8@users.noreply.github.com> Date: Wed, 30 Aug 2023 09:56:14 -0600 Subject: [PATCH 06/16] Update testWindows.yml --- .github/workflows/testWindows.yml | 85 ++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 25 deletions(-) diff --git a/.github/workflows/testWindows.yml b/.github/workflows/testWindows.yml index 7ed9ad681..3e61f36c9 100644 --- a/.github/workflows/testWindows.yml +++ b/.github/workflows/testWindows.yml @@ -61,48 +61,83 @@ jobs: dir Get-Content "CesiumForUnreal.uplugin" | select-string -pattern "EngineVersion" - name: Run Cesium tests - continue-on-error: true - timeout-minutes: 30 + timeout-minutes: 60 run: | cd "${{ inputs.unreal-binaries-path }}" ./UnrealEditor-Cmd.exe "$env:TESTS_PROJECT_ROOT/TestsProject.uproject" -execcmds="Automation RunTests Cesium.;quit" -nullrhi -unattended -nosplash -ReportExportPath="$env:TESTS_PROJECT_LOGS" - name: Display tests log + if: always() run: | cd "$env:TESTS_PROJECT_LOGS" dir Get-Content TestsProject.log - name: Display tests report + if: always() run: | cd "$env:TESTS_PROJECT_LOGS" Get-Content index.json - name: Evaluate tests results + if: always() run: | - $env:TEST_STATUS="Pending" - echo "test_status=$env:TEST_STATUS" >> $env:GITHUB_ENV - cd "$env:TESTS_PROJECT_LOGS" - # Define function to parse json recursively - function Parse-JsonRecursively($jsonObject) { - foreach ($property in $jsonObject.PSObject.Properties) { - $name = $property.Name - $value = $property.Value + $failedTests = "" + $succeededTests = "" + + function Parse-Test($jsonObject) { + $currTestName = "" + foreach ($property in $jsonObject.PSObject.Properties) { + $name = $property.Name + $value = $property.Value + + if($name -eq "fullTestPath") { + $currTestName = $value + } + + if($name -eq "state") { + if ($value -eq "Success") { + $global:succeededTests += $currTestName + "`n" + } + else { + $global:failedTests += $currTestName + "`n" + } + } + } + } + + function Parse-Json($jsonObject) { + foreach ($property in $jsonObject.PSObject.Properties) { + $name = $property.Name + $value = $property.Value - # If the property value is another object, call function recursively - if ($value -is [PSCustomObject]) { - Parse-JsonRecursively($value) - } - else { - # If "state:fail" entry is found in json, set failure state - if($name -eq "state" -and $value -eq "fail") { - $env:TEST_STATUS="Failure" - return - } - } - } + # If the property value is another object, call function recursively + if ($name -eq "tests" -and $value -is [System.Object[]]) { + for (($i = 0); $i -lt $value.Count; $i++) { + Parse-Test($value[$i]) + } + } + } } - $env:TEST_STATUS="Success" # Set status to success at start $json = Get-Content -Path 'index.json' | ConvertFrom-Json # Read in json - Parse-JsonRecursively -jsonObject $json # Parse json - echo "test_status=$env:TEST_STATUS" >> $env:GITHUB_ENV # Export result to github environment variables \ No newline at end of file + Parse-Json -jsonObject $json # Parse json + + echo " " + if ($failedTests.Length -eq 0) { + echo "All tests passed:" + echo "-----------------" + echo "$succeededTests" + + exit 0 + } + else { + echo "Passing tests:" + echo "--------------" + echo "$succeededTests" + + echo "FAILED tests:" + echo "-------------" + echo "$failedTests" + + exit -1 + } \ No newline at end of file From ad0fd1538f67d745a7028448c4067075b3afb42a Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Thu, 31 Aug 2023 21:46:18 +1000 Subject: [PATCH 07/16] Add workaround for Linux intermediates on the UE Marketplace. --- .github/workflows/build.yml | 27 +++++++++++++++++++++++++++ Config/FilterPlugin.ini | 11 +++++++++++ 2 files changed, 38 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8f06b843..8052b7efd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -226,6 +226,15 @@ jobs: with: name: CesiumForUnreal-50-windows-${{ env.CESIUM_UNREAL_VERSION}} path: combine + - name: Unreal Marketplace Workaround + run: | + # The UE Marketplace deletes our Intermediates directory and fails to produces new + # intermediates for the Linux platform. The Marketplace team has suggested we copy + # them to the LinuxIntermediate directory instead, as a workaround. Users still have + # to move these files to the correct place manually, though, in order for Linux builds + # to succeed. + mkdir -p combine/CesiumForUnreal/LinuxIntermediate/Build/Linux + cp -r combine/CesiumForUnreal/Intermediate/Build/Linux/* combine/CesiumForUnreal/LinuxIntermediate/Build/Linux - name: Publish combined package artifact if: ${{ success() }} uses: actions/upload-artifact@v3 @@ -467,6 +476,15 @@ jobs: with: name: CesiumForUnreal-51-windows-${{ env.CESIUM_UNREAL_VERSION}} path: combine + - name: Unreal Marketplace Workaround + run: | + # The UE Marketplace deletes our Intermediates directory and fails to produces new + # intermediates for the Linux platform. The Marketplace team has suggested we copy + # them to the LinuxIntermediate directory instead, as a workaround. Users still have + # to move these files to the correct place manually, though, in order for Linux builds + # to succeed. + mkdir -p combine/CesiumForUnreal/LinuxIntermediate/Build/Linux + cp -r combine/CesiumForUnreal/Intermediate/Build/Linux/* combine/CesiumForUnreal/LinuxIntermediate/Build/Linux - name: Publish combined package artifact if: ${{ success() }} uses: actions/upload-artifact@v3 @@ -727,6 +745,15 @@ jobs: with: name: CesiumForUnreal-52-windows-${{ env.CESIUM_UNREAL_VERSION}} path: combine + - name: Unreal Marketplace Workaround + run: | + # The UE Marketplace deletes our Intermediates directory and fails to produces new + # intermediates for the Linux platform. The Marketplace team has suggested we copy + # them to the LinuxIntermediate directory instead, as a workaround. Users still have + # to move these files to the correct place manually, though, in order for Linux builds + # to succeed. + mkdir -p combine/CesiumForUnreal/LinuxIntermediate/Build/Linux + cp -r combine/CesiumForUnreal/Intermediate/Build/Linux/* combine/CesiumForUnreal/LinuxIntermediate/Build/Linux - name: Publish combined package artifact if: ${{ success() }} uses: actions/upload-artifact@v3 diff --git a/Config/FilterPlugin.ini b/Config/FilterPlugin.ini index 37b008195..885617b31 100644 --- a/Config/FilterPlugin.ini +++ b/Config/FilterPlugin.ini @@ -7,4 +7,15 @@ /CHANGES.md /Shaders/* /Intermediate/Build/Linux/* +/LinuxInt/* /Binaries/Linux/* +/LinuxIntermediate/Build/Linux/UnrealEditor/Inc/CesiumEditor/UHT/* +/LinuxIntermediate/Build/Linux/UnrealEditor/Inc/CesiumRuntime/UHT/* +/LinuxIntermediate/Build/Linux/UnrealGame/Development/CesiumRuntime/* +/LinuxIntermediate/Build/Linux/UnrealGame/Inc/CesiumRuntime/UHT/* +/LinuxIntermediate/Build/Linux/UnrealGame/Shipping/CesiumRuntime/* +/LinuxIntermediate/Build/Linux/x64/UnrealGame/Development/CesiumRuntime/* +/LinuxIntermediate/Build/Linux/x64/UnrealGame/Shipping/CesiumRuntime/* +/LinuxIntermediate/Build/Linux/B4D820EA/UnrealGame/Development/CesiumRuntime/* +/LinuxIntermediate/Build/Linux/B4D820EA/UnrealGame/Inc/CesiumRuntime/UHT/* +/LinuxIntermediate/Build/Linux/B4D820EA/UnrealGame/Shipping/CesiumRuntime/* From e6b6d9a18dbd6600593f0e3fafca7c6631111aad Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Thu, 31 Aug 2023 21:50:23 +1000 Subject: [PATCH 08/16] Remove unnecessary folder from FilterPlugin.ini. --- Config/FilterPlugin.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/Config/FilterPlugin.ini b/Config/FilterPlugin.ini index 885617b31..b1cfb8c47 100644 --- a/Config/FilterPlugin.ini +++ b/Config/FilterPlugin.ini @@ -7,7 +7,6 @@ /CHANGES.md /Shaders/* /Intermediate/Build/Linux/* -/LinuxInt/* /Binaries/Linux/* /LinuxIntermediate/Build/Linux/UnrealEditor/Inc/CesiumEditor/UHT/* /LinuxIntermediate/Build/Linux/UnrealEditor/Inc/CesiumRuntime/UHT/* From 33c7159ee97d82118a513eed37c1e4582414f634 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Fri, 1 Sep 2023 12:22:59 +1000 Subject: [PATCH 09/16] Update cesium-native. --- extern/cesium-native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/cesium-native b/extern/cesium-native index da901d260..aac8c6018 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit da901d260eae9b0a802a396d11185a9fc24a711e +Subproject commit aac8c601885ce9e6465dbb4c9bfe6ce471890033 From bc15bafc66979cef60b10254339aa89c825d96ac Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Fri, 1 Sep 2023 15:46:01 +1000 Subject: [PATCH 10/16] Update to v1.30.0. --- CHANGES.md | 4 ++++ CesiumForUnreal.uplugin | 4 ++-- extern/cesium-native | 2 +- package.json | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index c8baf7250..73b488741 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Change Log +### v1.30.0 - 2023-09-01 + +This release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.26.0 to v0.27.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native. + ### v1.29.0 - 2023-08-01 ##### Fixes :wrench: diff --git a/CesiumForUnreal.uplugin b/CesiumForUnreal.uplugin index 1fdbc1be1..c9f3b6f5c 100644 --- a/CesiumForUnreal.uplugin +++ b/CesiumForUnreal.uplugin @@ -1,7 +1,7 @@ { "FileVersion": 3, - "Version": 47, - "VersionName": "1.29.0", + "Version": 48, + "VersionName": "1.30.0", "FriendlyName": "Cesium for Unreal", "Description": "Unlock the 3D geospatial ecosystem in Unreal Engine with real-world 3D content and a high accuracy full-scale WGS84 globe.", "Category": "Geospatial", diff --git a/extern/cesium-native b/extern/cesium-native index aac8c6018..b4aaf58ac 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit aac8c601885ce9e6465dbb4c9bfe6ce471890033 +Subproject commit b4aaf58acfa7c5b4149f529d5330c05b1fb42b76 diff --git a/package.json b/package.json index 407e0dd3e..6acbbf526 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cesium-unreal", - "version": "1.29.0", + "version": "1.30.0", "description": "Cesium for Unreal", "main": "index.js", "directories": { From e74a21a6f5499e465724877b19ce319a7ac3efae Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Fri, 1 Sep 2023 15:49:21 +1000 Subject: [PATCH 11/16] Fix CHANGES.md. --- CHANGES.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index c7d193508..4cc5b3b5f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,5 @@ # Change Log -<<<<<<< HEAD ### ? - ? ##### Breaking Changes :mega: @@ -21,13 +20,10 @@ - `ACesiumGeoreference`, `ACesiumCameraManager`, and `ACesiumCreditSystem` are now created in the Persistent Level, even if the object that triggered their automatic creation (such as `ACesium3DTileset`) exists in a sub-level. It is very rarely useful to have instances of these objects within a sub-level. - An instance of `ACesiumCreditSystem` in a sub-level will no longer cause overlapping and broken-looking credits. However, we still recommend deleting credit system instances from sub-levels. -||||||| 8200fa54 -======= ### v1.30.0 - 2023-09-01 This release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.26.0 to v0.27.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native. ->>>>>>> origin/v1.x ### v1.29.0 - 2023-08-01 ##### Fixes :wrench: From 12c4e3f5b177eee7d985718b8601bfb2fa399d36 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Fri, 1 Sep 2023 21:18:56 +1000 Subject: [PATCH 12/16] Put temp directory on the D drive --- .github/workflows/buildWindows.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/buildWindows.yml b/.github/workflows/buildWindows.yml index 7d8b87633..593e5d59e 100644 --- a/.github/workflows/buildWindows.yml +++ b/.github/workflows/buildWindows.yml @@ -34,16 +34,22 @@ jobs: $env:BUILD_CESIUM_UNREAL_PACKAGE_PATH="$env:GITHUB_WORKSPACE/packages/CesiumForUnreal" $env:UNREAL_BATCH_FILES_PATH="${{ inputs.unreal-batch-files-path }}" + # Store temp files on the D drive, which is much faster than the EBS-backed C drive. + mkdir -p d:\cesium\temp + $env:TEMP="d:\cesium\temp" + # Make these available to subsequent steps echo "BUILD_CESIUM_UNREAL_PACKAGE_NAME=${env:BUILD_CESIUM_UNREAL_PACKAGE_NAME}" >> $env:GITHUB_ENV echo "BUILD_CESIUM_UNREAL_PACKAGE_PATH=${env:BUILD_CESIUM_UNREAL_PACKAGE_PATH}" >> $env:GITHUB_ENV echo "UNREAL_BATCH_FILES_PATH=${env:UNREAL_BATCH_FILES_PATH}" >> $env:GITHUB_ENV + echo "TEMP=${env:TEMP}" >> $env:GITHUB_ENV # Confirm vars to the console echo "" echo BUILD_CESIUM_UNREAL_PACKAGE_NAME=$env:BUILD_CESIUM_UNREAL_PACKAGE_NAME echo BUILD_CESIUM_UNREAL_PACKAGE_PATH=$env:BUILD_CESIUM_UNREAL_PACKAGE_PATH echo UNREAL_BATCH_FILES_PATH=$env:UNREAL_BATCH_FILES_PATH + echo TEMP=$env:TEMP - name: Install nasm uses: ilammy/setup-nasm@v1.4.0 - name: Build cesium-native @@ -57,6 +63,7 @@ jobs: - name: Build CesiumForUnreal plugin timeout-minutes: 120 run: | + echo "Temp directory: $env:TEMP" cd "$env:UNREAL_BATCH_FILES_PATH" ./RunUAT.bat BuildPlugin -Plugin="$env:GITHUB_WORKSPACE/CesiumForUnreal.uplugin" -Package="$env:BUILD_CESIUM_UNREAL_PACKAGE_PATH" -CreateSubFolder -TargetPlatforms=Win64 - name: Upload plugin artifact @@ -64,4 +71,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ env.BUILD_CESIUM_UNREAL_PACKAGE_NAME}} - path: packages \ No newline at end of file + path: packages From 569ee1a51ce479cc317911b0e203735f79603ddd Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Sun, 3 Sep 2023 10:45:48 +1000 Subject: [PATCH 13/16] Fix finishLoading-related crash by updating cesium-native. --- extern/cesium-native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/cesium-native b/extern/cesium-native index b4aaf58ac..9cc9f83d8 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit b4aaf58acfa7c5b4149f529d5330c05b1fb42b76 +Subproject commit 9cc9f83d8169351bbc9018fab0d0d7e6e89e40ce From eb1ff0e1d9e19703a7563c6a0e85dcfcf9ee8bf7 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Sun, 3 Sep 2023 18:18:34 +1000 Subject: [PATCH 14/16] Update cesium-native. --- extern/cesium-native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/cesium-native b/extern/cesium-native index 9cc9f83d8..1248522db 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit 9cc9f83d8169351bbc9018fab0d0d7e6e89e40ce +Subproject commit 1248522dba50e06e13800baae8169592971308a9 From 54aa77b01fa40a5a78fd4ccad3219dbbcc8ee33a Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Sun, 3 Sep 2023 18:22:56 +1000 Subject: [PATCH 15/16] Bump to v1.30.1. --- CHANGES.md | 4 ++++ CesiumForUnreal.uplugin | 4 ++-- package.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 73b488741..808a216f2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Change Log +### v1.30.1 - 2023-09-03 + +This release fixes an important bug by updating [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.27.0 to v0.27.1. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native. + ### v1.30.0 - 2023-09-01 This release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.26.0 to v0.27.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native. diff --git a/CesiumForUnreal.uplugin b/CesiumForUnreal.uplugin index c9f3b6f5c..f3072b208 100644 --- a/CesiumForUnreal.uplugin +++ b/CesiumForUnreal.uplugin @@ -1,7 +1,7 @@ { "FileVersion": 3, - "Version": 48, - "VersionName": "1.30.0", + "Version": 49, + "VersionName": "1.30.1", "FriendlyName": "Cesium for Unreal", "Description": "Unlock the 3D geospatial ecosystem in Unreal Engine with real-world 3D content and a high accuracy full-scale WGS84 globe.", "Category": "Geospatial", diff --git a/package.json b/package.json index 6acbbf526..769410fce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cesium-unreal", - "version": "1.30.0", + "version": "1.30.1", "description": "Cesium for Unreal", "main": "index.js", "directories": { From 941b1aaf64a06569f9cf091f867fdfbeda947bbc Mon Sep 17 00:00:00 2001 From: Brian Langevin <130494071+csciguy8@users.noreply.github.com> Date: Thu, 7 Sep 2023 10:09:49 -0600 Subject: [PATCH 16/16] Change ios52 to use macos12 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8052b7efd..91606ff36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -660,7 +660,7 @@ jobs: name: ${{ env.BUILD_CESIUM_UNREAL_PACKAGE_NAME}} path: packages iOS52: - runs-on: macos-13 + runs-on: macos-12 env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}