diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae232cf..696af17 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,24 +20,22 @@ 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}} 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" -A x64 + cmake --build build --config $env:BUILD_CONFIGURATION --parallel + - name: StandalonePackage working-directory: ${{env.GITHUB_WORKSPACE}} run: | @@ -51,7 +49,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 +62,8 @@ 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/.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 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 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 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"]