From 9664b7853b0f78a6f7b796a8809bd7cb7a47b2ec Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Thu, 14 May 2026 18:27:15 -0700 Subject: [PATCH] ci: bump Android SDL3 download + Xbox One generator for VS 18 - Android: SDL3's `build-release.py` started requiring `download` before `android` so it can fetch the new gameinput dependency. (build-release.py is technically internal SDL tooling; longer-term we may want to invoke a different SDL3 build entry point.) - Xbox One: windows-latest now ships VS 18, so the `Visual Studio 17 2022` generator can no longer find a VS install. Bump to `Visual Studio 18 2026`. --- .github/workflows/ci.yml | 2 +- android-project/app/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8f338ec..3810204f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: - { name: 'Emscripten', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, emsdk: true, werror: true, clang-tidy: false, cmake-wrapper: 'emcmake' } - { name: 'Nintendo 3DS', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, n3ds: true, werror: true, clang-tidy: false, container: 'devkitpro/devkitarm:latest', cmake-args: '-DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/3DS.cmake' } - { name: 'Nintendo Switch', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, nx: true, werror: true, clang-tidy: false, container: 'devkitpro/devkita64:latest', cmake-args: '-DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake' } - - { name: 'Xbox One', os: 'windows-latest', generator: 'Visual Studio 17 2022', dx5: false, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64', cmake-args: '-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.26100.0', xbox-one: true} + - { name: 'Xbox One', os: 'windows-latest', generator: 'Visual Studio 18 2026', dx5: false, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64', cmake-args: '-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.26100.0', xbox-one: true} - { name: 'Android', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, android: true, werror: true, clang-tidy: false,} - { name: 'Vita', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, vita: true, werror: true, clang-tidy: false, cmake-args: '--toolchain /usr/local/vitasdk/share/vita.toolchain.cmake'} - { name: 'DOS', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, dos: true, werror: true, clang-tidy: false, cmake-args: '--toolchain $GITHUB_WORKSPACE/CMake/i586-pc-msdosdjgpp.cmake'} diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle index 1a73e4b9..78793187 100644 --- a/android-project/app/build.gradle +++ b/android-project/app/build.gradle @@ -77,7 +77,7 @@ tasks.register('compileSDL3AndroidArchive', Exec) { def sdl3Dir = "build/_deps/sdl3-src" commandLine 'python', "${sdl3Dir}/build-scripts/build-release.py", - '--actions', 'android', + '--actions', 'download', 'android', '--fast', '--force', "--root=${sdl3Dir}", "--android-api=${android.defaultConfig.minSdk}"