diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 66b03df2..2debc6de 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -69,12 +69,13 @@ jobs: - name: Install Android NDK if: ${{ matrix.arch == 'android-arm' || matrix.arch == 'android-aarch64' }} run: | - wget https://dl.google.com/android/repository/android-ndk-r27c-linux.zip -O android-ndk.zip + wget https://dl.google.com/android/repository/android-ndk-r28c-linux.zip -O android-ndk.zip unzip android-ndk.zip -d $HOME - export ANDROID_NDK=$HOME/android-ndk-r27c + export ANDROID_NDK=$HOME/android-ndk-r28c echo "ANDROID_NDK=$ANDROID_NDK" >> $GITHUB_ENV export ANDROID_ARCH_ABI=${{ matrix.android_arch_abi }} echo "ANDROID_ARCH_ABI=$ANDROID_ARCH_ABI" >> $GITHUB_ENV + echo "ANDROID_PLATFORM=29" >> $GITHUB_ENV - name: Prepare CMake Toolchain file shell: bash run: | @@ -107,7 +108,7 @@ jobs: if: ${{ matrix.arch == 'android-arm' || matrix.arch == 'android-aarch64' }} shell: bash run: | - echo "CMAKE_CONFIG_ARGS_ANDROID=-DCMAKE_ANDROID_ARCH_ABI=${ANDROID_ARCH_ABI}" >> $GITHUB_ENV + echo "CMAKE_CONFIG_ARGS_ANDROID=-DCMAKE_ANDROID_ARCH_ABI=${ANDROID_ARCH_ABI} -DANDROID_PLATFORM=${ANDROID_PLATFORM}" >> $GITHUB_ENV - name: Fetch and build OpenCL ICD Loader shell: bash run: | @@ -119,7 +120,7 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \ -DOPENCL_ICD_LOADER_HEADERS_DIR='${{ github.workspace }}'/OpenCL-Headers/ \ - "${CMAKE_CONFIG_ARGS_ANDROID}" + ${CMAKE_CONFIG_ARGS_ANDROID} cmake --build . --parallel - name: Fetch Vulkan Headers shell: bash @@ -168,7 +169,7 @@ jobs: -DVULKAN_IS_SUPPORTED=ON \ -DVULKAN_INCLUDE_DIR='${{ github.workspace }}'/Vulkan-Headers/include/ \ -DVULKAN_LIB_DIR='${{ github.workspace }}'/Vulkan-Loader/build/loader/ \ - "${CMAKE_CONFIG_ARGS_ANDROID}" + ${CMAKE_CONFIG_ARGS_ANDROID} cmake --build . --parallel formatcheck: name: Check code format