diff --git a/.github/workflows/eepp-android-build-check.yml b/.github/workflows/eepp-android-build-check.yml index 22f9d4e1b..7432adee5 100644 --- a/.github/workflows/eepp-android-build-check.yml +++ b/.github/workflows/eepp-android-build-check.yml @@ -3,7 +3,7 @@ name: Android on: [push, pull_request] jobs: - build: + Android: runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 @@ -21,13 +21,12 @@ jobs: sdkmanager "platform-tools" \ "platforms;android-34" \ "build-tools;34.0.0" \ - "ndk;28.1.13356709" + "ndk;29.0.14206865" - name: Configure local properties run: | cd projects/android-project { echo "sdk.dir=$ANDROID_SDK_ROOT" - echo "ndk.dir=$ANDROID_SDK_ROOT/ndk/28.1.13356709" } > local.properties - name: Build run: | diff --git a/.github/workflows/eepp-ios-build-check.yml b/.github/workflows/eepp-ios-build-check.yml index b812c1867..bef241821 100644 --- a/.github/workflows/eepp-ios-build-check.yml +++ b/.github/workflows/eepp-ios-build-check.yml @@ -3,7 +3,7 @@ name: iOS on: [push, pull_request] jobs: - MacOS: + iOS: runs-on: macos-latest steps: - uses: actions/checkout@v4 @@ -15,4 +15,4 @@ jobs: - name: Build run: | cd projects/ios - sh ./compile-all.sh + sh ./compile-all.sh config=release_arm64 diff --git a/README.md b/README.md index 57f9f273e..6b3c88d7c 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ framework heavily focused on the development of rich graphical user interfaces. [![Linux status](https://img.shields.io/github/actions/workflow/status/SpartanJ/eepp/eepp-linux-build-check.yml?branch=develop&label=Linux)](https://github.com/SpartanJ/eepp/actions?query=workflow%3ALinux) [![Windows status](https://img.shields.io/github/actions/workflow/status/SpartanJ/eepp/eepp-windows-build-check.yml?branch=develop&label=Windows)](https://github.com/SpartanJ/eepp/actions?query=workflow%3AWindows) [![macOS status](https://img.shields.io/github/actions/workflow/status/SpartanJ/eepp/eepp-macos-build-check.yml?branch=develop&label=macOS)](https://github.com/SpartanJ/eepp/actions?query=workflow%3AmacOS) +[![iOS status](https://img.shields.io/github/actions/workflow/status/SpartanJ/eepp/eepp-ios-build-check.yml?branch=develop&label=iOS)](https://github.com/SpartanJ/eepp/actions?query=workflow%3AiOS) +[![Android status](https://img.shields.io/github/actions/workflow/status/SpartanJ/eepp/eepp-android-build-check.yml?branch=develop&label=Android)](https://github.com/SpartanJ/eepp/actions?query=workflow%3AAndroid) ## Features diff --git a/projects/android-project/app/build.gradle b/projects/android-project/app/build.gradle index d7671590c..efa4062ea 100644 --- a/projects/android-project/app/build.gradle +++ b/projects/android-project/app/build.gradle @@ -104,7 +104,7 @@ android { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 } - ndkVersion "28.1.13356709" + ndkVersion "29.0.14206865" lint { abortOnError false } diff --git a/projects/ios/compile-all.sh b/projects/ios/compile-all.sh index 14ff1bfb6..1dec5e6df 100755 --- a/projects/ios/compile-all.sh +++ b/projects/ios/compile-all.sh @@ -1,5 +1,5 @@ #!/bin/sh -cd $(dirname "$0") +cd $(dirname "$0") || exit -./build-sdl2.sh ./compile-arm64.sh $@ +./build-sdl2.sh