From 94a9f72cfa0c9479cb3bf92fece1ed3ab949f498 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 23:28:17 +0000 Subject: [PATCH 1/3] Bump actions/download-artifact from 5 to 6 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 5 to 6. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 44 +++++++++---------- ...ve-binary-build-dlight.nativeexecution.yml | 10 ++--- .../native-binary-build-launcher.yml | 4 +- .../native-binary-build-lib.profiler.yml | 8 ++-- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f3a3d1c1ef42..1ac10f0c68f3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -259,7 +259,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -351,7 +351,7 @@ jobs: - name: Download Build if: ${{ needs.base-build.result == 'success' && !cancelled() }} - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -395,7 +395,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -485,7 +485,7 @@ jobs: distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }} - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -535,7 +535,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -864,7 +864,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -988,7 +988,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -1151,7 +1151,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -1286,7 +1286,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -1475,7 +1475,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -1531,7 +1531,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -1591,7 +1591,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -1636,7 +1636,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -1814,7 +1814,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -1864,7 +1864,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -1915,7 +1915,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -1963,7 +1963,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -2206,7 +2206,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -2299,7 +2299,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -2378,7 +2378,7 @@ jobs: # - - - - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -2507,7 +2507,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build @@ -2548,7 +2548,7 @@ jobs: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - name: Download Build - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: build diff --git a/.github/workflows/native-binary-build-dlight.nativeexecution.yml b/.github/workflows/native-binary-build-dlight.nativeexecution.yml index 36b22e4cdf47..6e31539821d3 100644 --- a/.github/workflows/native-binary-build-dlight.nativeexecution.yml +++ b/.github/workflows/native-binary-build-dlight.nativeexecution.yml @@ -110,7 +110,7 @@ jobs: steps: - name: Download sources - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: nativeexecution-external-sources @@ -144,7 +144,7 @@ jobs: # steps: # # - name: Download sources -# uses: actions/download-artifact@v5 +# uses: actions/download-artifact@v6 # with: # name: nativeexecution-external-sources # @@ -174,7 +174,7 @@ jobs: steps: - name: Download sources - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: nativeexecution-external-sources @@ -203,7 +203,7 @@ jobs: steps: - name: Download sources - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: nativeexecution-external-sources @@ -238,7 +238,7 @@ jobs: run: mkdir -p myfiles/ - name: Download artifacts from predecessor jobs - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: path: myfiles/ diff --git a/.github/workflows/native-binary-build-launcher.yml b/.github/workflows/native-binary-build-launcher.yml index 5b86cf60e8cd..613eafb7fb9d 100644 --- a/.github/workflows/native-binary-build-launcher.yml +++ b/.github/workflows/native-binary-build-launcher.yml @@ -105,7 +105,7 @@ jobs: run: sudo apt install mingw-w64 mingw-w64-tools - name: Download sources - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: launcher-external-sources @@ -171,7 +171,7 @@ jobs: run: mkdir -p myfiles/ - name: Download artifacts from predecessor jobs - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: path: myfiles/ diff --git a/.github/workflows/native-binary-build-lib.profiler.yml b/.github/workflows/native-binary-build-lib.profiler.yml index 5581c385fa7b..87e7bf21a11e 100644 --- a/.github/workflows/native-binary-build-lib.profiler.yml +++ b/.github/workflows/native-binary-build-lib.profiler.yml @@ -134,7 +134,7 @@ jobs: steps: - name: Download sources - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: profiler-external-sources-ASF @@ -195,7 +195,7 @@ jobs: steps: - name: Download sources - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: profiler-external-sources-ASF @@ -268,7 +268,7 @@ jobs: steps: - name: Download sources - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: profiler-external-sources-ASF @@ -313,7 +313,7 @@ jobs: run: mkdir -p myfiles/lib/deployed/jdk16 - name: Download artifacts from predecessor jobs - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: path: myfiles/lib/deployed/jdk16 From 73b530d123c546772c0964a74c283d7c782d30a3 Mon Sep 17 00:00:00 2001 From: Eric Barboni Date: Tue, 28 Oct 2025 16:27:00 +0100 Subject: [PATCH 2/3] try to build with default sdk on runner --- .github/workflows/native-binary-build-lib.profiler.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/native-binary-build-lib.profiler.yml b/.github/workflows/native-binary-build-lib.profiler.yml index 87e7bf21a11e..54de2a5a2278 100644 --- a/.github/workflows/native-binary-build-lib.profiler.yml +++ b/.github/workflows/native-binary-build-lib.profiler.yml @@ -201,10 +201,6 @@ jobs: # Build the native binary from C source code # - # Use Windows 10 SDK 10.0.20348.0 since build fails with Windows 11 SDK 10.0.22000.0 - # https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-170#vcvarsall-syntax - # https://bugs.python.org/issue45220 - # - name: Build native lib (64-bit) run: | echo on @@ -213,7 +209,7 @@ jobs: set OUTPUTDIR=../../release/lib/deployed/jdk16/windows-amd64 del /q /s "%OUTPUTDIR%" rem set up a Visual Studio command prompt for 64-bit development - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" 10.0.20348.0 + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" rem rem call buildnative-windows64-16.bat @@ -231,7 +227,7 @@ jobs: set OUTPUTDIR=../../release/lib/deployed/jdk16/windows del /q /s "%OUTPUTDIR%" rem set up a Visual Studio command prompt for 32-bit development - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" 10.0.20348.0 + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" rem rem call buildnative-windows-16.bat From 34245df45ddfd70790cf6d876b3d63d80e864127 Mon Sep 17 00:00:00 2001 From: Eric Barboni Date: Thu, 30 Oct 2025 10:01:21 +0100 Subject: [PATCH 3/3] Revert "try to build with default sdk on runner" --- .github/workflows/native-binary-build-lib.profiler.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/native-binary-build-lib.profiler.yml b/.github/workflows/native-binary-build-lib.profiler.yml index 54de2a5a2278..87e7bf21a11e 100644 --- a/.github/workflows/native-binary-build-lib.profiler.yml +++ b/.github/workflows/native-binary-build-lib.profiler.yml @@ -201,6 +201,10 @@ jobs: # Build the native binary from C source code # + # Use Windows 10 SDK 10.0.20348.0 since build fails with Windows 11 SDK 10.0.22000.0 + # https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-170#vcvarsall-syntax + # https://bugs.python.org/issue45220 + # - name: Build native lib (64-bit) run: | echo on @@ -209,7 +213,7 @@ jobs: set OUTPUTDIR=../../release/lib/deployed/jdk16/windows-amd64 del /q /s "%OUTPUTDIR%" rem set up a Visual Studio command prompt for 64-bit development - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" 10.0.20348.0 rem rem call buildnative-windows64-16.bat @@ -227,7 +231,7 @@ jobs: set OUTPUTDIR=../../release/lib/deployed/jdk16/windows del /q /s "%OUTPUTDIR%" rem set up a Visual Studio command prompt for 32-bit development - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" 10.0.20348.0 rem rem call buildnative-windows-16.bat