This commit is contained in:
NOTPIES
2026-04-21 00:18:01 -04:00
parent 646ca958b2
commit 3eacee60ea
8 changed files with 672 additions and 57 deletions

View File

@@ -31,7 +31,7 @@ permissions:
env:
BUILD_TYPE: Release
WINDOWS_PLATFORM_TOOLSET: v110
WINDOWS_PLATFORM_TOOLSET: v143
jobs:
windows64_client:
@@ -49,34 +49,6 @@ jobs:
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2
- name: Ensure VS2012 toolset (v110)
shell: pwsh
run: |
$vswhere = "${env:ProgramFiles(x86)}\\Microsoft Visual Studio\\Installer\\vswhere.exe"
if (-not (Test-Path $vswhere)) {
throw "vswhere.exe not found on runner."
}
$installPath = & $vswhere -latest -products * -requires Microsoft.Component.MSBuild -property installationPath
if (-not $installPath) {
throw "No Visual Studio instance with MSBuild found."
}
$v110 = & $vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.v110.x86.x64 -property installationPath
if (-not $v110) {
$installer = "${env:ProgramFiles(x86)}\\Microsoft Visual Studio\\Installer\\vs_installer.exe"
if (-not (Test-Path $installer)) {
throw "Visual Studio Installer not found. Cannot install v110 toolset."
}
& $installer modify --installPath "$installPath" --add Microsoft.VisualStudio.Component.VC.v110.x86.x64 --passive --norestart
}
$v110 = & $vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.v110.x86.x64 -property installationPath
if (-not $v110) {
throw "VS2012 toolset (v110) is not available on this runner after install attempt."
}
- name: Preflight Windows client dependencies
shell: pwsh
run: |
@@ -88,6 +60,8 @@ jobs:
"Minecraft.Client\\Windows64\\4JLibs\\libs\\4J_Profile_r.lib",
"Minecraft.Client\\Windows64\\4JLibs\\libs\\4J_Render_PC.lib",
"Minecraft.Client\\Durango\\Sound\\Minecraft.msscmp",
"Minecraft.Client\\Windows64\\Sentient\\SentientTelemetryCommon.h",
"Minecraft.Client\\Windows64\\Sentient\\MinecraftTelemetry.h",
"Minecraft.Client\\Common\\DLC\\DLCManager.h",
"Minecraft.Client\\Common\\DLC\\DLCFile.cpp"
)
@@ -261,6 +235,8 @@ jobs:
required=(
"./Minecraft.Client/Common/DLC/DLCFile.cpp"
"./Minecraft.Client/Common/DLC/DLCManager.h"
"./Minecraft.Client/Windows64/Sentient/SentientTelemetryCommon.h"
"./Minecraft.Client/Windows64/Sentient/MinecraftTelemetry.h"
)
missing=()
for f in "${required[@]}"; do
@@ -330,34 +306,6 @@ jobs:
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2
- name: Ensure VS2012 toolset (v110)
shell: pwsh
run: |
$vswhere = "${env:ProgramFiles(x86)}\\Microsoft Visual Studio\\Installer\\vswhere.exe"
if (-not (Test-Path $vswhere)) {
throw "vswhere.exe not found on runner."
}
$installPath = & $vswhere -latest -products * -requires Microsoft.Component.MSBuild -property installationPath
if (-not $installPath) {
throw "No Visual Studio instance with MSBuild found."
}
$v110 = & $vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.v110.x86.x64 -property installationPath
if (-not $v110) {
$installer = "${env:ProgramFiles(x86)}\\Microsoft Visual Studio\\Installer\\vs_installer.exe"
if (-not (Test-Path $installer)) {
throw "Visual Studio Installer not found. Cannot install v110 toolset."
}
& $installer modify --installPath "$installPath" --add Microsoft.VisualStudio.Component.VC.v110.x86.x64 --passive --norestart
}
$v110 = & $vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.v110.x86.x64 -property installationPath
if (-not $v110) {
throw "VS2012 toolset (v110) is not available on this runner after install attempt."
}
- name: Preflight Windows server dependencies
shell: pwsh
run: |
@@ -365,6 +313,8 @@ jobs:
"Minecraft.Client\\Windows64\\4JLibs\\libs\\4J_Storage.lib",
"Minecraft.Client\\Windows64\\4JLibs\\libs\\4J_Profile_r.lib",
"Minecraft.Client\\Windows64\\4JLibs\\libs\\4J_Render_PC.lib",
"Minecraft.Client\\Windows64\\Sentient\\SentientTelemetryCommon.h",
"Minecraft.Client\\Windows64\\Sentient\\MinecraftTelemetry.h",
"Minecraft.Client\\Common\\DLC\\DLCManager.h",
"Minecraft.Client\\Common\\DLC\\DLCFile.cpp"
)