Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build mac version 14 #308

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c264661
[github-acction] build jobs failure due to deprecated macOS-12 enviro…
ZhangLe2016 Dec 4, 2024
a3d197e
[github-acction] build jobs failure due to deprecated macOS-12 enviro…
ZhangLe2016 Dec 4, 2024
fa546cc
[github-acction] build jobs failure due to deprecated macOS-12 enviro…
ZhangLe2016 Dec 4, 2024
e053b35
Revert "[github-acction] build jobs failure due to deprecated macOS-1…
ZhangLe2016 Dec 4, 2024
0704054
[github-acction] build jobs failure due to deprecated macOS-12 enviro…
ZhangLe2016 Dec 4, 2024
fcfd013
[github-acction] build jobs failure due to deprecated macOS-12 enviro…
ZhangLe2016 Dec 4, 2024
889a79a
handling the build failure in nightly-build (26, x86_64, macos-13)
ZhangLe2016 Dec 4, 2024
a792f4e
execute the realpath command based on OS environment
ZhangLe2016 Dec 4, 2024
c5cd580
execute the realpath command based on OS environment
ZhangLe2016 Dec 4, 2024
3f374fe
execute the realpath command based on OS environment
ZhangLe2016 Dec 4, 2024
ba76632
execute the realpath command based on OS environment
ZhangLe2016 Dec 4, 2024
2e8bfaf
execute the realpath command based on OS environment
ZhangLe2016 Dec 4, 2024
ea29891
execute the realpath command based on OS environment
ZhangLe2016 Dec 4, 2024
6485a51
execute the realpath command based on OS environment
ZhangLe2016 Dec 4, 2024
80ce37a
execute the realpath command based on OS environment
ZhangLe2016 Dec 4, 2024
461319e
[github-acction] build jobs failure due to deprecated macOS-12 enviro…
ZhangLe2016 Dec 4, 2024
9ad5187
[github-acction] build jobs failure due to deprecated macOS-12 enviro…
ZhangLe2016 Dec 4, 2024
56893da
restore the common.sh file
ZhangLe2016 Dec 4, 2024
4002d9d
restore the common.sh file
ZhangLe2016 Dec 4, 2024
946fade
Test
ZhangLe2016 Dec 5, 2024
83833bc
change ABI from x86_64 to arm64-v8a for MacOS14
ZhangLe2016 Dec 5, 2024
539d948
RM64 emulation on a x86_64 host currently is only possible up to API …
ZhangLe2016 Dec 5, 2024
4348936
RM64 emulation on a x86_64 host currently is only possible up to API …
ZhangLe2016 Dec 5, 2024
dedb81a
change the android-api to 28 and list all ndk files
ZhangLe2016 Dec 5, 2024
a414c6b
update the android-sdk from 26 to 28
ZhangLe2016 Dec 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/android-app-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
android-api: [26, 34]
android-api: [28, 34]
android-abi: [x86_64]
os: [macos-12, ubuntu-22.04]
os: [macos-14, ubuntu-22.04]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v4
Expand All @@ -50,7 +50,8 @@ jobs:
- name: Build
run: |
cd android
ANDROID_ABI=${{ matrix.android-abi }} ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "26.*") ./build-commissioner-libs.sh
ls $ANDROID_HOME/ndk/*
ANDROID_ABI=${{ matrix.android-abi }} ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "28.*") ./build-commissioner-libs.sh
cd openthread_commissioner
./gradlew build
- name: Tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/android-app-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ jobs:
- name: Build APK
run: |
cd android
ANDROID_ABI=armeabi-v7a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "26.*") ./build-commissioner-libs.sh
ANDROID_ABI=arm64-v8a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "26.*") ./build-commissioner-libs.sh
ANDROID_ABI=armeabi-v7a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "28.*") ./build-commissioner-libs.sh
ANDROID_ABI=arm64-v8a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "28.*") ./build-commissioner-libs.sh
cd openthread_commissioner
./gradlew assembleDebug

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
./tests/interpreter-test

macos:
runs-on: macos-12
runs-on: macos-14
steps:
- uses: actions/checkout@v3
- name: Bootstrap
Expand Down Expand Up @@ -159,11 +159,11 @@ jobs:
- name: Build
run: |
cd android
ANDROID_ABI=armeabi-v7a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "26.*") ./build-commissioner-libs.sh
ANDROID_ABI=arm64-v8a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "26.*") ./build-commissioner-libs.sh
ANDROID_ABI=armeabi-v7a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "28.*") ./build-commissioner-libs.sh
ANDROID_ABI=arm64-v8a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "28.*") ./build-commissioner-libs.sh

java-binding:
runs-on: macos-12
runs-on: macos-14
steps:
- uses: actions/checkout@v3
- name: Bootstrap
Expand Down
2 changes: 1 addition & 1 deletion android/build-commissioner-libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#

readonly CUR_DIR="$(dirname "$(realpath -s "$0")")"
readonly CUR_DIR="$(dirname "$(realpath "$0")")"

set -e

Expand Down
10 changes: 4 additions & 6 deletions script/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ if [ "$(uname)" = "Linux" ]; then
cmake \
ninja-build \
swig \
android-sdk \
lcov \
jsonlint

Expand All @@ -105,7 +106,6 @@ if [ "$(uname)" = "Linux" ]; then
echo "Did you forget to add '/usr/bin' to beginning of your PATH?"
exit 1
}

elif [ "$(uname)" = "Darwin" ]; then
echo "OS is Darwin"

Expand All @@ -115,7 +115,8 @@ elif [ "$(uname)" = "Darwin" ]; then
readline \
cmake \
ninja \
swig@4 \
swig \
android-sdk \
lcov && true

brew install llvm@14 && \
Expand All @@ -130,15 +131,12 @@ elif [ "$(uname)" = "Darwin" ]; then
brew unlink cmake
brew install cmake --HEAD
}

## Install coreutils for realpath
brew install coreutils
else
echo "platform $(uname) is not fully supported"
exit 1
fi

readonly CUR_DIR="$(dirname "$(realpath -s "$0")")"
readonly CUR_DIR="$(dirname "$(realpath "$0")")"

cd "${CUR_DIR}/.."
if [ "${WITH_CCM}" = "1" ]; then
Expand Down
Loading