Skip to content

Commit

Permalink
[github-action] migrate from macOS-12 to macos-13 (#307)
Browse files Browse the repository at this point in the history
  • Loading branch information
ZhangLe2016 authored Dec 5, 2024
1 parent bb5f9a4 commit 53b4774
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
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]
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

0 comments on commit 53b4774

Please sign in to comment.