Skip to content

Commit cde5fe3

Browse files
Mac BASH update for CI scripts (#2400)
1 parent 226a318 commit cde5fe3

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.github/workflows/pull-request.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,16 @@ jobs:
187187
mod: 500
188188
rem: 1
189189
run: |
190+
brew update
191+
brew install bash
192+
/usr/bin/env bash --version
190193
uname -a
191194
cd pico-sdk
192195
git submodule update --init
193196
cd ..
194-
bash ./tests/build.sh
197+
/usr/bin/env bash ./tests/build.sh
198+
./system/picotool/picotool version
199+
otool -L ./system/picotool/picotool
195200
196201
# Build a few examples with PlatformIO to test if integration works
197202
build-platformio:

tests/common.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ function build_sketches()
112112
mv $build_dir/build.options.json.tmp $build_dir/build.options.json
113113
# Set the time of the cached core.a file to the future so the GIT header
114114
# we regen won't cause the builder to throw it out and rebuild from scratch.
115-
touch -d 'now + 1 day' $cache_dir/core/*.a
115+
uname -a | grep -qi darwin
116+
if [ $? == 1 ]; then
117+
touch -d 'now + 1 day' $cache_dir/core/*.a
118+
fi
116119
fi
117120

118121
# Clear out the last built sketch, map, elf, bin files, but leave the compiled

0 commit comments

Comments
 (0)