a

narknon · narknon · commit 6f77403ff7fb · 2025-09-08T19:07:22.000-04:00
diff --git a/.github/workflows/cmake-experimental.yml b/.github/workflows/cmake-experimental.yml
@@ -24,64 +24,51 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  build:
+    uses: ./.github/workflows/cmake_build_ue4ss.yml
+    secrets: inherit
+    with:
+      build-mode: "Game__Shipping__Win64"
+      commit-sha: ${{ github.sha }}
+      should-upload-artifact: true
+      artifact-retention-days: 1
+
   make-release:
+    needs: build
     permissions: write-all
     runs-on: windows-2022
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
-          fetch-depth: 0 # needed to get commits since last tag
+          fetch-depth: 0
           token: ${{ secrets.UEPSEUDO_PAT }}
 
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
           python-version: '3.9'
 
-      # Specifically use MSVC toolset v19.39.33523
-      - name: Install VS2022 BuildTools 17.9.7
-        run: choco install -y visualstudio2022buildtools --version=117.9.7.0 --params "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --installChannelUri https://aka.ms/vs/17/release/180911598_-255012421/channel"
-
-      - name: Setup CMake and Ninja
-        run: |
-          choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System'
-          choco install ninja
-
-      - name: Configure CMake
-        shell: pwsh
-        run: |
-          Import-Module 'C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll'
-          Enter-VsDevShell -VsInstallPath 'C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools' -DevCmdArguments '-arch=x64 -host_arch=x64'
-          
-          cmake -B build_experimental `
-            -G Ninja `
-            -DCMAKE_BUILD_TYPE=Game__Shipping__Win64 `
-            -DCMAKE_C_COMPILER=cl `
-            -DCMAKE_CXX_COMPILER=cl
-
-      - name: Build
-        shell: pwsh
-        run: |
-          cmake --build build_experimental --target UE4SS
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: CMAKE-Game__Shipping__Win64
+          path: build_output/
 
-      # The release script expects binaries in specific locations
-      - name: Prepare for packaging
+      - name: Verify downloaded files
         shell: pwsh
         run: |
-          # Find UE4SS.dll and ensure it's where the release script expects
-          $buildDir = "build_experimental"
-          
-          $dllPath = Get-ChildItem -Path $buildDir -Recurse -Filter "UE4SS.dll" | Select-Object -First 1
-          $pdbPath = Get-ChildItem -Path $buildDir -Recurse -Filter "UE4SS.pdb" | Select-Object -First 1
+          Write-Host "Contents of build_output:"
+          Get-ChildItem -Path "build_output" -Recurse | ForEach-Object { Write-Host $_.FullName }
           
-          if ($dllPath) {
-            Write-Host "Found UE4SS.dll at: $($dllPath.FullName)"
-          } else {
-            Write-Error "UE4SS.dll not found!"
-            exit 1
+          $requiredFiles = @("UE4SS.dll", "dwmapi.dll")
+          foreach ($file in $requiredFiles) {
+            $filePath = Get-ChildItem -Path "build_output" -Recurse -Filter $file -ErrorAction SilentlyContinue | Select-Object -First 1
+            if (-not $filePath) {
+              Write-Error "$file not found in downloaded artifacts!"
+              exit 1
+            }
           }
 
       - name: Package
diff --git a/.github/workflows/cmake-release.yml b/.github/workflows/cmake-release.yml
@@ -9,75 +9,72 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  prepare-release:
+    permissions: write-all
+    runs-on: ubuntu-latest
+    outputs:
+      release_tag: ${{ steps.release_tag.outputs.release_tag }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.UEPSEUDO_PAT }}
+
+      - name: Create Test Release Tag
+        id: release_tag
+        run: |
+          timestamp=$(date +'%Y%m%d-%H%M%S')
+          testTag="cmake-test-$timestamp"
+          echo "release_tag=$testTag" >> $GITHUB_OUTPUT
+          echo "Test release tag: $testTag"
+
+  build:
+    needs: prepare-release
+    uses: ./.github/workflows/cmake_build_ue4ss.yml
+    secrets: inherit
+    with:
+      build-mode: "Game__Shipping__Win64"
+      commit-sha: ${{ github.sha }}
+      should-upload-artifact: true
+      artifact-retention-days: 1
+
   make-release:
+    needs: [prepare-release, build]
     permissions: write-all
     runs-on: windows-2022
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
-          fetch-depth: 0 # needed to get commits since last tag
+          fetch-depth: 0
           token: ${{ secrets.UEPSEUDO_PAT }}
 
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
           python-version: '3.9'
 
-      # Specifically use MSVC toolset v19.39.33523
-      - name: Install VS2022 BuildTools 17.9.7
-        run: choco install -y visualstudio2022buildtools --version=117.9.7.0 --params "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --installChannelUri https://aka.ms/vs/17/release/180911598_-255012421/channel"
-
-      - name: Setup CMake and Ninja
-        run: |
-          choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System'
-          choco install ninja
-
-      - name: Create Test Release Tag
-        id: release_tag
-        run: |
-          $timestamp = Get-Date -Format "yyyyMMdd-HHmmss"
-          $testTag = "cmake-test-$timestamp"
-          echo "release_tag=$testTag" >> $env:GITHUB_OUTPUT
-          echo "Test release tag: $testTag"
-
-      - name: Configure and Build
-        shell: pwsh
-        run: |
-          Import-Module 'C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll'
-          Enter-VsDevShell -VsInstallPath 'C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools' -DevCmdArguments '-arch=x64 -host_arch=x64'
-          
-          cmake -B build_release `
-            -G Ninja `
-            -DCMAKE_BUILD_TYPE=Game__Shipping__Win64 `
-            -DCMAKE_C_COMPILER=cl `
-            -DCMAKE_CXX_COMPILER=cl
-          
-          cmake --build build_release --target UE4SS
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: CMAKE-Game__Shipping__Win64
+          path: build_output/
 
-      # The release script expects binaries in specific locations
-      # CMake outputs to build_release/bin or build_release/
-      - name: Prepare for packaging
+      - name: Verify downloaded files
         shell: pwsh
         run: |
-          # Create expected directory structure
-          $buildDir = "build_release"
-          
-          # Find UE4SS.dll and UE4SS.pdb
-          $dllPath = Get-ChildItem -Path $buildDir -Recurse -Filter "UE4SS.dll" | Select-Object -First 1
-          $pdbPath = Get-ChildItem -Path $buildDir -Recurse -Filter "UE4SS.pdb" | Select-Object -First 1
-          
-          if ($dllPath) {
-            Write-Host "Found UE4SS.dll at: $($dllPath.FullName)"
-          } else {
-            Write-Error "UE4SS.dll not found!"
-            exit 1
-          }
+          Write-Host "Contents of build_output:"
+          Get-ChildItem -Path "build_output" -Recurse | ForEach-Object { Write-Host $_.FullName }
           
-          if ($pdbPath) {
-            Write-Host "Found UE4SS.pdb at: $($pdbPath.FullName)"
+          $requiredFiles = @("UE4SS.dll", "dwmapi.dll")
+          foreach ($file in $requiredFiles) {
+            $filePath = Get-ChildItem -Path "build_output" -Recurse -Filter $file -ErrorAction SilentlyContinue | Select-Object -First 1
+            if (-not $filePath) {
+              Write-Error "$file not found in downloaded artifacts!"
+              exit 1
+            }
           }
 
       - name: Package
@@ -102,13 +99,13 @@ jobs:
       - name: Create Test Release
         uses: softprops/action-gh-release@v1
         with:
-          tag_name: ${{ steps.release_tag.outputs.release_tag }}
-          name: "CMake Test Release - ${{ steps.release_tag.outputs.release_tag }}"
+          tag_name: ${{ needs.prepare-release.outputs.release_tag }}
+          name: "CMake Test Release - ${{ needs.prepare-release.outputs.release_tag }}"
           body_path: release/release_notes.md
           draft: true
           prerelease: true
           files: |
             release/UE4SS_v*.zip
             release/zDEV-UE4SS_v*.zip
             release/zCustomGameConfigs.zip
-            release/zMapGenBP.zip
+            release/zMapGenBP.zip
diff --git a/.github/workflows/cmake_build_ue4ss.yml b/.github/workflows/cmake_build_ue4ss.yml
@@ -1,6 +1,5 @@
 # Summary
 # This reusable workflow handles building UE4SS with CMake, including setup of dependencies and uploading of artifacts.
-# Any future workflows/tasks that require UE4SS to be built should call this reusable workflow to ensure consistency.
 name: "Build UE4SS with CMake"
 permissions:
   contents: read
@@ -19,10 +18,6 @@ on:
         description: 'Should build output be uploaded as an artifact?'
         type: boolean
         default: false
-      artifact-list:
-        description: 'List of targets to upload artifacts for'
-        type: string
-        default: '["UE4SS"]'
       artifact-retention-days:
         description: 'How many days to retain artifacts'
         type: number
@@ -41,18 +36,14 @@ jobs:
           token: ${{ secrets.UEPSEUDO_PAT }}
           ref: ${{inputs.commit-sha}}
 
-      # Store the current week (00-53) to use as part of the cache key.
-      # This saves us from having to detect older caches and delete them.
       - name: Get current week as package key
         id: cache_key
         run: echo "key=$(date +'%W')" >> $GITHUB_OUTPUT
         shell: bash
 
-      # Specifically use MSVC toolset v19.39.33523
       - name: Install VS2022 BuildTools 17.9.7
         run: choco install -y visualstudio2022buildtools --version=117.9.7.0 --params "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --installChannelUri https://aka.ms/vs/17/release/180911598_-255012421/channel"
 
-      # Setup CMake and Ninja
       - name: Setup CMake
         uses: jwlawson/actions-setup-cmake@v2
         with:
@@ -61,16 +52,15 @@ jobs:
       - name: Setup Ninja
         uses: seanmiddleditch/gha-setup-ninja@v5
 
-      # Create build directory name based on mode
       - name: Create build directory name
         id: build_dir
         run: |
           $mode = "${{inputs.build-mode}}"
           $buildDir = "build_cmake_$mode"
           echo "name=$buildDir" >> $env:GITHUB_OUTPUT
 
-      # Configure CMake
-      - name: Configure CMake
+      # FIXED: Combined Configure and Build, added proxy target
+      - name: Configure and Build
         run: |
           Import-Module 'C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll'
           Enter-VsDevShell -VsInstallPath 'C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools' -DevCmdArguments '-arch=x64 -host_arch=x64'
@@ -81,65 +71,38 @@ jobs:
             -DCMAKE_C_COMPILER=cl `
             -DCMAKE_CXX_COMPILER=cl `
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-
-      # Build
-      - name: Build
-        id: build
-        run: |
-          cmake --build ${{ steps.build_dir.outputs.name }} --target UE4SS
           
-          # Get the actual output path
-          $outputPath = "${{ steps.build_dir.outputs.name }}/bin"
-          echo "output_path=$outputPath" >> $env:GITHUB_OUTPUT
+          # Build both UE4SS and proxy targets
+          cmake --build ${{ steps.build_dir.outputs.name }} --target UE4SS
+          cmake --build ${{ steps.build_dir.outputs.name }} --target proxy
 
-      # Collect files for artifact
+      # FIXED: Collect all required artifacts including dwmapi.dll
       - name: Calculate Files For Artifact Inclusion
         id: calc-files-artifact
         if: ${{inputs.should-upload-artifact == true}}
         run: |
           $artifact_dir = New-Item -Path '${{runner.temp}}/ue4ss_artifacts/' -ItemType Directory -Force
+          $buildDir = "${{ steps.build_dir.outputs.name }}"
           
-          # Find all DLL and PDB files in the output directory
-          $outputPath = "${{ steps.build.outputs.output_path }}"
-          
-          # Copy UE4SS.dll and UE4SS.pdb if they exist
-          $dllPath = Join-Path $outputPath "UE4SS.dll"
-          $pdbPath = Join-Path $outputPath "UE4SS.pdb"
-          
-          if (Test-Path $dllPath) {
-            Write-Host "Found: $dllPath"
-            Copy-Item $dllPath -Destination $artifact_dir
-          }
-          
-          if (Test-Path $pdbPath) {
-            Write-Host "Found: $pdbPath"
-            Copy-Item $pdbPath -Destination $artifact_dir
-          }
-          
-          # Also check in the build directory root
-          $buildRoot = "${{ steps.build_dir.outputs.name }}"
-          $dllPathRoot = Join-Path $buildRoot "UE4SS.dll"
-          $pdbPathRoot = Join-Path $buildRoot "UE4SS.pdb"
-          
-          if ((Test-Path $dllPathRoot) -and !(Test-Path (Join-Path $artifact_dir "UE4SS.dll"))) {
-            Write-Host "Found in root: $dllPathRoot"
-            Copy-Item $dllPathRoot -Destination $artifact_dir
-          }
-          
-          if ((Test-Path $pdbPathRoot) -and !(Test-Path (Join-Path $artifact_dir "UE4SS.pdb"))) {
-            Write-Host "Found in root: $pdbPathRoot"
-            Copy-Item $pdbPathRoot -Destination $artifact_dir
+          # Find and copy UE4SS files
+          $files = @("UE4SS.dll", "UE4SS.pdb", "dwmapi.dll")
+          foreach ($fileName in $files) {
+            $filePath = Get-ChildItem -Path $buildDir -Recurse -Filter $fileName -ErrorAction SilentlyContinue | Select-Object -First 1
+            if ($filePath) {
+              Write-Host "Found: $($filePath.FullName)"
+              Copy-Item $filePath.FullName -Destination $artifact_dir
+            } else {
+              Write-Host "Warning: $fileName not found"
+            }
           }
           
-          echo "artifact_dir=$artifact_dir" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
+          echo "artifact_dir=$artifact_dir" >> $env:GITHUB_OUTPUT
 
       - name: Upload a Build Artifact
-        id: upload-artifact
-        uses: actions/upload-artifact@v4.3.3
         if: ${{inputs.should-upload-artifact == true}}
+        uses: actions/upload-artifact@v4
         with:
-          name: MSVC-CMAKE-${{inputs.build-mode}}
-          path: |
-                ${{ steps.calc-files-artifact.outputs.artifact_dir }}
-          retention-days: ${{fromJSON(inputs.artifact-retention-days)}}
+          name: CMAKE-${{inputs.build-mode}}
+          path: ${{ steps.calc-files-artifact.outputs.artifact_dir }}
+          retention-days: ${{inputs.artifact-retention-days}}
           overwrite: true
