From 5f2f0ca18daad920dc3be9f4ac7c5c859619bf39 Mon Sep 17 00:00:00 2001 From: William Chen Date: Fri, 9 Oct 2026 17:56:59 -0400 Subject: [PATCH 1/3] Initial commit for hotfix/ci-android-sdk From aaad4422838987f1d38b7322fae7e5fd5b0028ea Mon Sep 17 00:00:00 2001 From: William Chen Date: Fri, 9 Oct 2026 18:00:41 -0400 Subject: [PATCH 2/3] Update android-actions/setup-android to v3 There are newer versions, but testing this version for now since the sdl2.yml workflow also uses it. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e326351877..5dd325effd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: java-version: 21 distribution: "temurin" - name: Setup Android Environment - uses: android-actions/setup-android@v2 + uses: android-actions/setup-android@v3 env: ANDROID_SDK_ROOT: /Users/runner/Library/Android/sdk - name: Install Android Platforms From b8c743ed3617500ef56861b04f122219f6152ff2 Mon Sep 17 00:00:00 2001 From: William Chen Date: Fri, 9 Oct 2026 18:08:45 -0400 Subject: [PATCH 3/3] Use latest version of android-actions/setup-android (v4.0.4) --- .github/workflows/build.yml | 2 +- .github/workflows/sdl2.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5dd325effd..acb6edf375 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: java-version: 21 distribution: "temurin" - name: Setup Android Environment - uses: android-actions/setup-android@v3 + uses: android-actions/setup-android@v4.0.4 env: ANDROID_SDK_ROOT: /Users/runner/Library/Android/sdk - name: Install Android Platforms diff --git a/.github/workflows/sdl2.yml b/.github/workflows/sdl2.yml index 683120813d..6228c3c19f 100644 --- a/.github/workflows/sdl2.yml +++ b/.github/workflows/sdl2.yml @@ -68,7 +68,7 @@ jobs: run: | echo "cur_path=$env:PATH\n" >> $env:GITHUB_OUTPUT - name: Setup Android Environment - uses: android-actions/setup-android@v3 + uses: android-actions/setup-android@v4.0.4 if: runner.os == 'Windows' env: PATH: "${{ env.DOTNET_ROOT }};${{ env.DOTNET_ROOT }}\\tools;${{ steps.set_path.outputs.cur_path }}" @@ -159,4 +159,3 @@ jobs: run: ${{ matrix.env.nuke_invoke }} SDL2 ${{ runner.os == 'Windows' && format('{0} {1}', '--native true --android-home-value', env.ANDROID_HOME) || '' }} env: PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }} -