From 826b0a4b00a0cf72ba36e75aa45a1905e8077454 Mon Sep 17 00:00:00 2001 From: Lars Herschke Date: Tue, 28 Jul 2026 15:35:12 +0200 Subject: [PATCH 1/4] Fix for building for Windows with Rust 1.87+ --- launchers/utils.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/launchers/utils.sh b/launchers/utils.sh index ef773997b..2a0267a81 100644 --- a/launchers/utils.sh +++ b/launchers/utils.sh @@ -37,7 +37,10 @@ function build() { cargo test --no-run rm -fv $BUILD_DIR/target/debug/launcher-*.d ; $KCOV $BUILD_DIR $BUILD_DIR/target/debug/launcher-* - else + else + if isWindows; then + export RUSTFLAGS="-C link-arg=-ladvapi32" + fi #on linux patch out deps? RUST_BACKTRACE=1 cargo test #some windows? From ce54c40d92487afbc007f530907facc8af68dea9 Mon Sep 17 00:00:00 2001 From: Lars Herschke Date: Wed, 29 Jul 2026 11:10:47 +0200 Subject: [PATCH 2/4] RUSTFLAGS have been removed again and a variant is now being used instead that is recognised by booth the GNU linker and the MSCV linker. --- launchers/rust-launcher/src/os_access.rs | 1 + launchers/utils.sh | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/launchers/rust-launcher/src/os_access.rs b/launchers/rust-launcher/src/os_access.rs index df17542d6..706f6433e 100644 --- a/launchers/rust-launcher/src/os_access.rs +++ b/launchers/rust-launcher/src/os_access.rs @@ -396,6 +396,7 @@ pub mod win { // function declarations + #[link(name = "advapi32", kind = "dylib")] extern "system" { pub fn AttachConsole(dwProcessId: c_ulong) -> c_int; diff --git a/launchers/utils.sh b/launchers/utils.sh index 2a0267a81..840aa13ca 100644 --- a/launchers/utils.sh +++ b/launchers/utils.sh @@ -38,9 +38,6 @@ function build() { rm -fv $BUILD_DIR/target/debug/launcher-*.d ; $KCOV $BUILD_DIR $BUILD_DIR/target/debug/launcher-* else - if isWindows; then - export RUSTFLAGS="-C link-arg=-ladvapi32" - fi #on linux patch out deps? RUST_BACKTRACE=1 cargo test #some windows? From 817d9ee3075fb469ac186c036c295a6c2c5ab1a2 Mon Sep 17 00:00:00 2001 From: Lars Herschke Date: Wed, 29 Jul 2026 11:14:36 +0200 Subject: [PATCH 3/4] Also remove the spaces to get it exactly back to the way it was before. --- launchers/utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launchers/utils.sh b/launchers/utils.sh index 840aa13ca..ef773997b 100644 --- a/launchers/utils.sh +++ b/launchers/utils.sh @@ -37,7 +37,7 @@ function build() { cargo test --no-run rm -fv $BUILD_DIR/target/debug/launcher-*.d ; $KCOV $BUILD_DIR $BUILD_DIR/target/debug/launcher-* - else + else #on linux patch out deps? RUST_BACKTRACE=1 cargo test #some windows? From 2e1171abbbec7a034b6db0a0bcba94a57c896ee8 Mon Sep 17 00:00:00 2001 From: Lars Herschke Date: Thu, 30 Jul 2026 12:23:04 +0200 Subject: [PATCH 4/4] update setup-java and codeql-action to force Java 8 with current autobuild --- .github/workflows/codeql-analysis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9b866f1d2..1198a6944 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,13 +39,14 @@ jobs: # require Java 1.8 - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v5 with: - java-version: 1.8 + distribution: 'temurin' + java-version: '8' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -56,7 +57,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v4 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -70,4 +71,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v4