From cde5fe3de57b8ee1deb9eefa7c3f5a404c0d1fc9 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Sat, 31 Aug 2024 12:53:00 -0700 Subject: [PATCH] Mac BASH update for CI scripts (#2400) --- .github/workflows/pull-request.yml | 7 ++++++- tests/common.sh | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 1a044da..745610e 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -187,11 +187,16 @@ jobs: mod: 500 rem: 1 run: | + brew update + brew install bash + /usr/bin/env bash --version uname -a cd pico-sdk git submodule update --init cd .. - bash ./tests/build.sh + /usr/bin/env bash ./tests/build.sh + ./system/picotool/picotool version + otool -L ./system/picotool/picotool # Build a few examples with PlatformIO to test if integration works build-platformio: diff --git a/tests/common.sh b/tests/common.sh index 7dd2044..61a5db6 100755 --- a/tests/common.sh +++ b/tests/common.sh @@ -112,7 +112,10 @@ function build_sketches() mv $build_dir/build.options.json.tmp $build_dir/build.options.json # Set the time of the cached core.a file to the future so the GIT header # we regen won't cause the builder to throw it out and rebuild from scratch. - touch -d 'now + 1 day' $cache_dir/core/*.a + uname -a | grep -qi darwin + if [ $? == 1 ]; then + touch -d 'now + 1 day' $cache_dir/core/*.a + fi fi # Clear out the last built sketch, map, elf, bin files, but leave the compiled