diff --git a/.github/workflows/android-app-build.yml b/.github/workflows/android-app-build.yml index bc140c10..2012f200 100644 --- a/.github/workflows/android-app-build.yml +++ b/.github/workflows/android-app-build.yml @@ -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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c9b2ad6..7844a7d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -125,7 +125,7 @@ jobs: ./tests/interpreter-test macos: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v3 - name: Bootstrap @@ -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 diff --git a/android/build-commissioner-libs.sh b/android/build-commissioner-libs.sh index ed9c40e9..651a0946 100755 --- a/android/build-commissioner-libs.sh +++ b/android/build-commissioner-libs.sh @@ -27,7 +27,7 @@ # POSSIBILITY OF SUCH DAMAGE. # -readonly CUR_DIR="$(dirname "$(realpath -s "$0")")" +readonly CUR_DIR="$(dirname "$(realpath "$0")")" set -e diff --git a/script/bootstrap.sh b/script/bootstrap.sh index f817cba5..86933324 100755 --- a/script/bootstrap.sh +++ b/script/bootstrap.sh @@ -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" @@ -115,7 +114,7 @@ elif [ "$(uname)" = "Darwin" ]; then readline \ cmake \ ninja \ - swig@4 \ + swig \ lcov && true brew install llvm@14 && \ @@ -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