Merge pull request #32 from apple1417/master

fix bl3 mod menu crashes on latest update, pull in willow mod menu tweaks

Author: apple1417

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "[email protected]:bl-sdk/common_dotfiles.git",
-  "commit": "138df08443b451852ec12a7de0a38882a0298408",
+  "commit": "0cdd1f9c966014dd31dd542109c480d83f3a3ae4",
   "checkout": null,
   "context": {
     "cookiecutter": {

.github/workflows/build.yml

@@ -13,42 +13,13 @@ on:
         required: false
 
 env:
-  # Important to pin the clang version, cause we also use it for linting
-  CLANG_VERSION: 17
-  CLANG_TIDY_JOBS: 4
   # LLVM MinGW download
-  LLVM_MINGW_VERSION: llvm-mingw-20231128-msvcrt-ubuntu-20.04-x86_64
-  LLVM_MINGW_DOWNLOAD: https://github.com/mstorsjo/llvm-mingw/releases/download/20231128/llvm-mingw-20231128-msvcrt-ubuntu-20.04-x86_64.tar.xz
-  # xwin settings
-  XWIN_VERSION: xwin-0.5.0-x86_64-unknown-linux-musl
-  XWIN_DOWNLOAD: https://github.com/Jake-Shadle/xwin/releases/download/0.5.0/xwin-0.5.0-x86_64-unknown-linux-musl.tar.gz
-  # Python settings
-  PYTHON_VERSION: "3.12.3"
+  LLVM_MINGW_VERSION: llvm-mingw-20240619-msvcrt-ubuntu-20.04-x86_64
+  LLVM_MINGW_DOWNLOAD: https://github.com/mstorsjo/llvm-mingw/releases/download/20240619/llvm-mingw-20240619-msvcrt-ubuntu-20.04-x86_64.tar.xz
 
 jobs:
-  cache-clang:
-    runs-on: windows-latest
-
-    steps:
-    - name: Cache Clang
-      uses: actions/cache@v4
-      id: cache-clang
-      with:
-        path: C:\Program Files\LLVM
-        key: ${{ runner.os }}-clang-${{ env.CLANG_VERSION }}
-        lookup-only: true
-
-    - name: Setup Clang
-      if: steps.cache-clang.outputs.cache-hit != 'true'
-      uses: egor-tensin/setup-clang@v1
-      with:
-        version: ${{ env.CLANG_VERSION }}
-
-# ==============================================================================
-
   build-windows:
     runs-on: windows-latest
-    needs: cache-clang
 
     strategy:
       fail-fast: false
@@ -58,13 +29,9 @@ jobs:
         - msvc-release
 
     steps:
-    - name: Restore Clang Cache
+    - name: Setup Clang
       if: startswith(matrix.preset, 'clang')
-      uses: actions/cache/restore@v4
-      with:
-        path: C:\Program Files\LLVM
-        key: ${{ runner.os }}-clang-${{ env.CLANG_VERSION }}
-        fail-on-cache-miss: true
+      uses: egor-tensin/setup-clang@v1
 
     - name: Add MSVC to PATH
       if: startswith(matrix.preset, 'msvc')
@@ -92,12 +59,7 @@ jobs:
       run: |
         pip install requests
 
-        python libs/pyunrealsdk/common_cmake/explicit_python/download.py        `
-          ${{ env.PYTHON_VERSION }}                                             `
-          amd64                                                                 `
-          --no-debug
-
-        cmake . --preset ${{ matrix.preset }}
+        cmake . --preset ${{ matrix.preset }} -G Ninja
 
     - name: Build
       working-directory: ${{ env.GITHUB_WORKSPACE }}
@@ -122,114 +84,73 @@ jobs:
         path: "*.zip"
 
   build-ubuntu:
-    runs-on: ubuntu-latest
+    # Require at least 24 for the mingw build
+    runs-on: ubuntu-24.04
 
     strategy:
       fail-fast: false
       matrix:
         preset:
         - clang-cross-release
         - llvm-mingw-release
-        # Currently, ubuntu-latest is 22.04, whose mingw version is too old, so disabling this build
-        # for now
-        # Not sure of the exact threshold, 13.1.0 works
-        #  - mingw-release
+        - mingw-release
 
     steps:
     - name: Setup CMake and Ninja
       uses: lukka/get-cmake@latest
 
-    - name: Setup Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: ">=3.11"
-
-    - name: Setup msitools
+    - name: Setup apt packages
       uses: awalsh128/cache-apt-pkgs-action@latest
       with:
-        packages: msitools
+        packages: msitools python3-requests
         version: ${{ runner.os }}-apt
 
-    # Both Clang and MinGW install quick enough that it's not worth caching
-    # Caching would also lose the +x - so we'd have to tar before caching/untar after, making it
-    #  even slower
-    - name: Setup Clang
-      if: startswith(matrix.preset, 'clang')
-      run: |
-        wget https://apt.llvm.org/llvm.sh
-        chmod +x llvm.sh
-        sudo ./llvm.sh ${{ env.CLANG_VERSION }}
-
-        sudo update-alternatives --install              \
-          /usr/bin/clang                                \
-          clang                                         \
-          /usr/bin/clang-${{ env.CLANG_VERSION }}       \
-          200
-        sudo update-alternatives --install              \
-          /usr/bin/clang++                              \
-          clang++                                       \
-          /usr/bin/clang++-${{ env.CLANG_VERSION }}     \
-          200
-        sudo update-alternatives --install              \
-          /usr/bin/llvm-rc                              \
-          llvm-rc                                       \
-          /usr/bin/llvm-rc-${{ env.CLANG_VERSION }}     \
-          200
-
     - name: Setup LLVM MinGW
       if: startswith(matrix.preset, 'llvm-mingw')
       run: |
         wget -nv ${{ env.LLVM_MINGW_DOWNLOAD }}
         tar -xf ${{ env.LLVM_MINGW_VERSION }}.tar.xz -C ~/
         echo $(readlink -f ~/${{ env.LLVM_MINGW_VERSION }}/bin) >> $GITHUB_PATH
 
-    - name: Set up MinGW
+    - name: Setup MinGW
       if: startswith(matrix.preset, 'mingw')
       uses: egor-tensin/setup-mingw@v2
       with:
-        platform: ${{ fromJSON('["x86", "x64"]')[contains(matrix.preset, 'x64')] }}
+        platform: x64
+
+    - name: Setup Clang
+      if: startswith(matrix.preset, 'clang-cross')
+      uses: egor-tensin/setup-clang@v1
 
-    # xwin does take long enough that caching's worth it
-    - name: Restore xwin cache
-      if: contains(matrix.preset, 'cross')
+    - name: Restore win sdk cache
+      if: startswith(matrix.preset, 'clang-cross')
       uses: actions/cache@v4
-      id: cache-xwin
+      id: cache-win-sdk
       with:
-        path: ~/xwin
-        key: ${{ runner.os }}-xwin
+        path: ~/win-sdk
+        key: ${{ runner.os }}-win-sdk
 
-    - name: Setup xwin
-      if: contains(matrix.preset, 'cross') && steps.cache-xwin.outputs.cache-hit != 'true'
+    - name: Setup win sdk
+      if: startswith(matrix.preset, 'clang-cross') && steps.cache-win-sdk.outputs.cache-hit != 'true'
       run: |
-        wget -nv ${{ env.XWIN_DOWNLOAD }}
-        tar -xf ${{ env.XWIN_VERSION }}.tar.gz
-        ${{ env.XWIN_VERSION }}/xwin    \
-          --accept-license              \
-          --arch x86_64                 \
-          splat                         \
-          --include-debug-libs          \
-          --output ~/xwin
+        git clone https://github.com/mstorsjo/msvc-wine.git
+        msvc-wine/vsdownload.py --accept-license --dest ~/win-sdk Microsoft.VisualStudio.Workload.VCTools
+        msvc-wine/install.sh ~/win-sdk
+        rm -r msvc-wine
 
     - name: Checkout repository and submodules
       uses: actions/checkout@v4
       with:
         submodules: recursive
 
-    - name: Configure build
+    - name: Configure CMake
       working-directory: ${{ env.GITHUB_WORKSPACE }}
-      run: |
-        pip install requests
-
-        python libs/pyunrealsdk/common_cmake/explicit_python/download.py        \
-          ${{ env.PYTHON_VERSION }}                                             \
-          amd64                                                                 \
-          --no-debug
-
-        cmake .                           \
-        --preset ${{ matrix.preset }}     \
-        -G Ninja                          \
-        -DXWIN_DIR=$(readlink -f ~)/xwin
-      # The extra xwin dir arg won't do anything if we're not cross compiling
+      # The extra msvc wine arg won't do anything if we're not cross compiling
+      run: >
+        cmake .
+        --preset ${{ matrix.preset }}
+        -G Ninja
+        -DMSVC_WINE_ENV_SCRIPT=$(readlink -f ~)/win-sdk/bin/x64/msvcenv.sh
 
     - name: Build
       working-directory: ${{ env.GITHUB_WORKSPACE }}
@@ -250,7 +171,6 @@ jobs:
 
   clang-tidy:
     runs-on: windows-latest
-    needs: cache-clang
 
     strategy:
       fail-fast: false
@@ -259,12 +179,9 @@ jobs:
         - clang-release
 
     steps:
-    - name: Restore Clang Cache
-      uses: actions/cache/restore@v4
-      with:
-        path: C:\Program Files\LLVM
-        key: ${{ runner.os }}-clang-${{ env.CLANG_VERSION }}
-        fail-on-cache-miss: true
+    - name: Setup Clang
+      if: startswith(matrix.preset, 'clang')
+      uses: egor-tensin/setup-clang@v1
 
     - name: Setup CMake and Ninja
       uses: lukka/get-cmake@latest
@@ -274,24 +191,21 @@ jobs:
       with:
         python-version: ">=3.11"
 
+    # Needed pyyaml for clang tidy to enable `-export-fixes` and requests for the python lib downloader
+    - name: Install pip packages
+      run: pip install pyyaml requests
+
     - name: Checkout repository and submodules
       uses: actions/checkout@v4
       with:
         submodules: recursive
 
-    - name: Configure build
+    - name: Configure CMake
       working-directory: ${{ env.GITHUB_WORKSPACE }}
-      # Also need pyyaml for clang tidy to enable `-export-fixes`
-      run: |
-        pip install pyyaml requests
-
-        python libs/pyunrealsdk/common_cmake/explicit_python/download.py        `
-          ${{ env.PYTHON_VERSION }}                                             `
-          amd64                                                                 `
-          --no-debug
-
-        cmake . --preset ${{ matrix.preset }} -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On
+      run: cmake . --preset ${{ matrix.preset }} -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On
 
+    - name: Remove `.modmap`s from compile commands
+      run: |
         (Get-Content "out\build\${{ matrix.preset }}\compile_commands.json")    `
           -replace "@CMakeFiles.+?\.modmap", ""                                 `
         | Set-Content                                                           `
@@ -301,15 +215,9 @@ jobs:
       working-directory: ${{ env.GITHUB_WORKSPACE }}
       run: |
         python (Get-Command run-clang-tidy).Source                              `
-          -j ${{ env.CLANG_TIDY_JOBS }}                                         `
           -p "out\build\${{ matrix.preset }}"                                   `
           -export-fixes clang-tidy-fixes.yml                                    `
-          $([Regex]::Escape("$pwd\src") + ".+\.(c|cpp|h|hpp)$")                 `
-          -extra-arg="-Wno-unknown-pragmas"
-      # For some reason, the above started giving unknown pragma errors in library headers (both
-      # unrealsdk and python) in clang-tidy 17
-      # It compiles fine, doesn't show up in clangd, and doesn't happen in the unrealsdk build, so
-      # just suppressing it for now
+          $([Regex]::Escape("$pwd\src") + ".+\.(c|cpp|h|hpp)$")
 
     - name: Process clang-tidy warnings
       uses: asarium/clang-tidy-action@v1
@@ -318,15 +226,11 @@ jobs:
 
   clang-format:
     runs-on: windows-latest
-    needs: cache-clang
 
     steps:
-    - name: Restore Clang Cache
-      uses: actions/cache/restore@v4
-      with:
-        path: C:\Program Files\LLVM
-        key: ${{ runner.os }}-clang-${{ env.CLANG_VERSION }}
-        fail-on-cache-miss: true
+    - name: Setup Clang
+      if: startswith(matrix.preset, 'clang')
+      uses: egor-tensin/setup-clang@v1
 
     - name: Checkout repository
       uses: actions/checkout@v4