From d6467bfc710a512457dbd423fe300469d452ef94 Mon Sep 17 00:00:00 2001 From: dohq Date: Thu, 28 Aug 2025 09:52:29 +0900 Subject: [PATCH 01/10] chore(format): apply clang-format remove tailing whitespace --- .github/workflows/build.yml | 15 +++++++-------- Scripts/build_project.ps1 | 8 ++++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae232cf..00db202 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,14 +20,14 @@ jobs: known_hosts: unnecessary - name: Checkout SFV - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive fetch-depth: 0 # needed to get commits since last tag ssh-key: ${{ secrets.UEPSEUDO_SSH_KEY }} - + - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v2 - name: Build working-directory: ${{env.GITHUB_WORKSPACE}} @@ -37,7 +37,7 @@ jobs: cmake -G "Visual Studio 17 2022" .. msbuild /p:Configuration=${{env.BUILD_CONFIGURATION}} .\StriveFrameData\StriveFrameData.sln msbuild /p:Configuration=${{env.BUILD_CONFIGURATION}} .\RE-UE4SS\UE4SS\proxy_generator\proxy\proxy.sln - + - name: StandalonePackage working-directory: ${{env.GITHUB_WORKSPACE}} run: | @@ -51,7 +51,7 @@ jobs: cp .\prereqs\FText_Constructor.lua .\standalone\UE4SS_Signatures\FText_Constructor.lua - name: Upload Artifact - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v4 with: name: StriveFrameViewer_Standalone path: ${{github.workspace}}\standalone\ @@ -64,12 +64,11 @@ jobs: cp .\build\StriveFrameData\${{env.BUILD_CONFIGURATION}}\StriveFrameData.dll .\unverum\ue4ss\StriveFrameViewer\dlls\main.dll - name: Upload Artifact - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v4 with: name: StriveFrameViewer_Unverum path: ${{github.workspace}}\unverum\ if-no-files-found: error - - \ No newline at end of file + diff --git a/Scripts/build_project.ps1 b/Scripts/build_project.ps1 index 7b629bf..063bc92 100644 --- a/Scripts/build_project.ps1 +++ b/Scripts/build_project.ps1 @@ -12,21 +12,21 @@ function Build { Write-Host "`n##### Running CMake #####`n" $RCode = Run cmake.exe "-G `"Visual Studio 17 2022`" .." - if($RCode -ne 0) { + if($RCode -ne 0) { Write-Host "##### Failed CMake #####" - return $RCode + return $RCode } Write-Host "`n##### Running MSBuild Mod #####`n" $RCode = Run MSBuild.exe "/p:Configuration=Game__Shipping__Win64 .\StriveFrameData\StriveFrameData.sln" - if($RCode -ne 0) { + if($RCode -ne 0) { Write-Host "`n##### Failed MSBuild Mod #####" return $RCode } Write-Host "`n##### Running MSBuild Proxy #####`n" $RCode = Run MSBuild.exe "/p:Configuration=Game__Shipping__Win64 .\RE-UE4SS\UE4SS\proxy_generator\proxy\proxy.sln" - if($RCode -ne 0) { + if($RCode -ne 0) { Write-Host "`n##### Failed MSBuild Proxy #####" } return $RCode From cc7a21bb06b8ee120827f513ae4706f251f89a0e Mon Sep 17 00:00:00 2001 From: dohq Date: Thu, 28 Aug 2025 10:53:50 +0900 Subject: [PATCH 02/10] feat(UE4SS): use official repository use UE4SS-RE/RE-UE4SS instead of Sevoii/RE-UE4SS --- .gitmodules | 2 +- RE-UE4SS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9c8c496..baba03c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = https://github.com/TsudaKageyu/minhook.git [submodule "RE-UE4SS"] path = RE-UE4SS - url = https://github.com/Chitaso/RE-UE4SS.git + url = git@github.com:UE4SS-RE/RE-UE4SS.git diff --git a/RE-UE4SS b/RE-UE4SS index 4e5461c..b5e6483 160000 --- a/RE-UE4SS +++ b/RE-UE4SS @@ -1 +1 @@ -Subproject commit 4e5461c0dd6201c654198a3e6f28126eaf9016fa +Subproject commit b5e6483d57d2f86656418cd8e1bfad43304a5b3b From 7cd1804ecd1c5afa23bb623ea1af4f715edd27dc Mon Sep 17 00:00:00 2001 From: dohq Date: Thu, 28 Aug 2025 11:28:01 +0900 Subject: [PATCH 03/10] chore(workflow): rollback setup-msbuild v1.0.2 --- .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 00db202..4ba581d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: ssh-key: ${{ secrets.UEPSEUDO_SSH_KEY }} - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v2 + uses: microsoft/setup-msbuild@v1.0.2 - name: Build working-directory: ${{env.GITHUB_WORKSPACE}} From f22c71ed055ece81aa4a36b9361d47900de1c0a3 Mon Sep 17 00:00:00 2001 From: dohq Date: Thu, 28 Aug 2025 11:34:18 +0900 Subject: [PATCH 04/10] Revert "chore(workflow): rollback setup-msbuild v1.0.2" This reverts commit 7cd1804ecd1c5afa23bb623ea1af4f715edd27dc. --- .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 4ba581d..00db202 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: ssh-key: ${{ secrets.UEPSEUDO_SSH_KEY }} - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v2 - name: Build working-directory: ${{env.GITHUB_WORKSPACE}} From df00a18f5f6cd91279927e6ce012dc2cc5d24d7f Mon Sep 17 00:00:00 2001 From: dohq Date: Thu, 28 Aug 2025 11:35:50 +0900 Subject: [PATCH 05/10] chore(workflow): update necessary actions --- .github/workflows/soon.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/soon.yml b/.github/workflows/soon.yml index 26d7e31..e4bff09 100644 --- a/.github/workflows/soon.yml +++ b/.github/workflows/soon.yml @@ -20,21 +20,21 @@ jobs: known_hosts: unnecessary - name: Checkout SFV - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive fetch-depth: 0 # needed to get commits since last tag ssh-key: ${{ secrets.UEPSEUDO_SSH_KEY }} - + - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v2 - name: Build working-directory: ${{env.GITHUB_WORKSPACE}} shell: pwsh run: | .\Scripts\build_project.ps1 - + - name: StandalonePackage working-directory: ${{env.GITHUB_WORKSPACE}} shell: pwsh @@ -42,7 +42,7 @@ jobs: .\Scripts\package_standalone.ps1 - name: Upload Artifact - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v4 with: name: StriveFrameViewer_Standalone path: ${{github.workspace}}\Packages\Standalone\ @@ -55,12 +55,8 @@ jobs: .\Scripts\package_unverum.ps1 - name: Upload Artifact - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v4 with: name: StriveFrameViewer_Unverum path: ${{github.workspace}}\Packages\Unverum\ - if-no-files-found: error - - - - \ No newline at end of file + if-no-files-found: error \ No newline at end of file From b6efad0e5b9ed4ba6fd4eeb0872cf85ec8b7bfe0 Mon Sep 17 00:00:00 2001 From: dohq Date: Thu, 28 Aug 2025 14:31:14 +0900 Subject: [PATCH 06/10] chore(workflow): add rust toolchain --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00db202..d6582be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,9 @@ jobs: fetch-depth: 0 # needed to get commits since last tag ssh-key: ${{ secrets.UEPSEUDO_SSH_KEY }} + - name: Add Rust to PATH + uses: actions-rust-lang/setup-rust-toolchain@v1 + - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v2 From f09161cb2c1bd2a55958434d7a765965b705a69a Mon Sep 17 00:00:00 2001 From: dohq Date: Thu, 28 Aug 2025 14:43:06 +0900 Subject: [PATCH 07/10] chore(workflow): change rust setup actions use dtolnay/rust-toolchain instead of actions-rust-lang/setup-rust-toolchain --- .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 d6582be..f05bf8b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: ssh-key: ${{ secrets.UEPSEUDO_SSH_KEY }} - name: Add Rust to PATH - uses: actions-rust-lang/setup-rust-toolchain@v1 + uses: dtolnay/rust-toolchain@stable - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v2 From 476514ca49d0358bc2db1bfe2281bc931d80661d Mon Sep 17 00:00:00 2001 From: dohq Date: Thu, 28 Aug 2025 15:03:26 +0900 Subject: [PATCH 08/10] chore(workflow): add rust cargo path --- .github/workflows/build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f05bf8b..abbda6a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,6 +29,10 @@ jobs: - name: Add Rust to PATH uses: dtolnay/rust-toolchain@stable + - name: Ensure Rust in PATH for PowerShell + shell: pwsh + run: echo "$env:CARGO_HOME\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v2 @@ -36,10 +40,8 @@ jobs: working-directory: ${{env.GITHUB_WORKSPACE}} run: | mkdir build - cd build - cmake -G "Visual Studio 17 2022" .. - msbuild /p:Configuration=${{env.BUILD_CONFIGURATION}} .\StriveFrameData\StriveFrameData.sln - msbuild /p:Configuration=${{env.BUILD_CONFIGURATION}} .\RE-UE4SS\UE4SS\proxy_generator\proxy\proxy.sln + cmake -S . -B build -G "Visual Studio 17 2022" + cmake --build build --config $env:BUILD_CONFIGURATION --parallel - name: StandalonePackage working-directory: ${{env.GITHUB_WORKSPACE}} From 40f3145117c0617b53565dd0082439c69e132172 Mon Sep 17 00:00:00 2001 From: dohq Date: Thu, 28 Aug 2025 19:16:42 +0900 Subject: [PATCH 09/10] feat(workflow): fixed rust toolchain ver use rust-toolchain.toml --- rust-toolchain.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 rust-toolchain.toml diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..2aceb2d --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "1.80.0" +components = ["rustc", "cargo"] From 4d8cdc157cb6c82d23a70ac0efd64f1de12597ff Mon Sep 17 00:00:00 2001 From: dohq Date: Thu, 28 Aug 2025 19:36:02 +0900 Subject: [PATCH 10/10] chore(workflow): remove unused rust task remove dtolnay/rust-toolchain --- .github/workflows/build.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index abbda6a..696af17 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,13 +26,6 @@ jobs: fetch-depth: 0 # needed to get commits since last tag ssh-key: ${{ secrets.UEPSEUDO_SSH_KEY }} - - name: Add Rust to PATH - uses: dtolnay/rust-toolchain@stable - - - name: Ensure Rust in PATH for PowerShell - shell: pwsh - run: echo "$env:CARGO_HOME\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v2 @@ -40,7 +33,7 @@ jobs: working-directory: ${{env.GITHUB_WORKSPACE}} run: | mkdir build - cmake -S . -B build -G "Visual Studio 17 2022" + cmake -S . -B build -G "Visual Studio 17 2022" -A x64 cmake --build build --config $env:BUILD_CONFIGURATION --parallel - name: StandalonePackage @@ -74,6 +67,3 @@ jobs: name: StriveFrameViewer_Unverum path: ${{github.workspace}}\unverum\ if-no-files-found: error - - -