mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2026-06-09 01:25:03 -06:00
Revert "ci: Override Android SDK Ninja with newer version"
This reverts commit eee7f076ee.
This commit is contained in:
parent
76a71d76d4
commit
b081f800a4
13
.github/workflows/build.yml
vendored
13
.github/workflows/build.yml
vendored
@ -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
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user