Revert "ci: Override Android SDK Ninja with newer version"
Some checks failed
citra-build / source (push) Has been cancelled
citra-build / linux-x86_64 (appimage) (push) Has been cancelled
citra-build / linux-x86_64 (appimage-wayland) (push) Has been cancelled
citra-build / linux-x86_64 (gcc-nopch) (push) Has been cancelled
citra-build / linux-arm64 (clang) (push) Has been cancelled
citra-build / linux-arm64 (gcc-nopch) (push) Has been cancelled
citra-build / macos (push) Has been cancelled
citra-build / windows (msvc) (push) Has been cancelled
citra-build / windows (msys2) (push) Has been cancelled
citra-build / android (googleplay) (push) Has been cancelled
citra-build / android (vanilla) (push) Has been cancelled
citra-build / docker (push) Has been cancelled
citra-format / clang-format (push) Has been cancelled
citra-libretro / android (push) Has been cancelled
citra-libretro / linux (push) Has been cancelled
citra-libretro / windows (push) Has been cancelled
citra-libretro / macos (arm64) (push) Has been cancelled
citra-libretro / macos (x86_64) (push) Has been cancelled
citra-libretro / ios (push) Has been cancelled
citra-libretro / tvos (push) Has been cancelled
citra-transifex / transifex (push) Has been cancelled

This reverts commit eee7f076ee.
This commit is contained in:
OpenSauce04 2026-05-04 16:38:40 +01:00 committed by OpenSauce
parent 76a71d76d4
commit b081f800a4

View file

@ -256,18 +256,15 @@ jobs:
echo "GIT_TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV echo "GIT_TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
fi fi
echo $GIT_TAG_NAME echo $GIT_TAG_NAME
- name: Update Android SDK CMake version
if: ${{ env.SHOULD_RUN == 'true' }}
run: |
yes | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "cmake;3.30.3"
- name: Install tools - name: Install tools
if: ${{ env.SHOULD_RUN == 'true' }} if: ${{ env.SHOULD_RUN == 'true' }}
run: | run: |
sudo apt-get update -y sudo apt-get update -y
sudo apt-get install -y apksigner ccache sudo apt-get install ccache apksigner -y
echo "Checking ninja version..." - name: Update Android SDK CMake version
/usr/local/bin/ninja --version if: ${{ env.SHOULD_RUN == 'true' }}
ln -sf /usr/local/bin/ninja /usr/local/lib/android/sdk/cmake/3.30.3/bin/ninja run: |
echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "cmake;3.30.3"
- name: Build - name: Build
if: ${{ env.SHOULD_RUN == 'true' }} if: ${{ env.SHOULD_RUN == 'true' }}
run: JAVA_HOME=$JAVA_HOME_17_X64 ./.ci/android.sh run: JAVA_HOME=$JAVA_HOME_17_X64 ./.ci/android.sh