Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 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
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
2 changes: 1 addition & 1 deletion .github/workflows/android-app-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
matrix:
android-api: [26, 34]
android-abi: [x86_64]
os: [macos-12, ubuntu-22.04]
os: [macos-13, ubuntu-22.04]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you try macos-14?

Copy link
Contributor Author

@ZhangLe2016 ZhangLe2016 Dec 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

macOS-14 may introduce a new issue: 'Timeout waiting for emulator to boot.' Currently, there is no known solution to address this issue.

https://github.com/openthread/ot-commissioner/actions/runs/12174524147?pr=308
https://github.com/openthread/ot-commissioner/actions/runs/12174524147/job/33959234711?pr=308#step:6:77

Copy link
Contributor Author

@ZhangLe2016 ZhangLe2016 Dec 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jwhui The current reason why we cannot use macOS 14 is that the CPU architecture of macOS 14 has changed, making it incompatible with Android API 26 or 27 ABI x86_64. Upgrading the Android NDK version to 28 or above is required. I tried to upgrade the Android NDK version using apt install/brew install android-sdk, but it was unsuccessful in the current GitHub environment. Therefore, there is no effective way to directly use macOS 14 in the short term. We will temporarily use the macOS 13 environment and upgrade to macOS 14 as the GitHub environment changes. What do you think? Thanks~~

image
https://stackoverflow.com/questions/74760054/panic-avds-cpu-architecture-arm64-is-not-supported-by-the-qemu2-emulator-on

image

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for checking. I'm fine with deferring change to macos-14 to later.

steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v4
Expand Down
4 changes: 2 additions & 2 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-13
steps:
- uses: actions/checkout@v3
- name: Bootstrap
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
ANDROID_ABI=arm64-v8a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "26.*") ./build-commissioner-libs.sh

java-binding:
runs-on: macos-12
runs-on: macos-13
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
8 changes: 2 additions & 6 deletions script/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,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 +114,7 @@ elif [ "$(uname)" = "Darwin" ]; then
readline \
cmake \
ninja \
swig@4 \
swig \
lcov && true

brew install llvm@14 && \
Expand All @@ -130,15 +129,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