Skip to content

Commit b2325eb

Browse files
committed
ccache+fix
1 parent 3e8ca2e commit b2325eb

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ jobs:
2020
cd -
2121
west update -o=--filter=tree:0
2222
23+
- name: Enable ccache
24+
uses: hendrikmuhs/[email protected]
25+
2326
- name: Build fade
2427
working-directory: build
2528
run: |

.github/workflows/package_core.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ jobs:
3131
echo "ARTIFACT_NAME=ArduinoCore-zephyr-$(git describe --always)" >> "$GITHUB_ENV"
3232
echo "FQBNS=[ $(cat boards.txt | grep '^[^#]*\.build\.variant' | cut -d '.' -f 1 | xargs printf '"%s",' | sed -e 's/,$//') ]" >> "$GITHUB_ENV"
3333
34+
- name: Enable ccache
35+
uses: hendrikmuhs/[email protected]
36+
3437
- name: Build
3538
run: ./extra/build_all.sh -f
3639

extra/build_all.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,8 @@ jq -cr '.[]' < ./extra/targets.json | while read -r item; do
2929
board=$(jq -cr '.board // ""' <<< "$item")
3030
args=$(jq -cr '.args // ""' <<< "$item")
3131

32-
ls extra -l
33-
variant=$(./extra/get_variant_name.sh "$board" || echo "$board")
34-
variant2=$(echo "$board")
35-
echo Board: $board
36-
echo Args: $args
37-
echo Variant: $variant
38-
./extra/get_variant_name.sh "$board"
39-
echo Variant2: $variant2
40-
41-
echo && echo && echo
32+
variant=$(extra/get_variant_name.sh "$board" || echo "$board")
33+
echo && echo
4234
echo ${variant}
4335
echo ${variant} | sed -e 's/./=/g'
4436
if [ ! -z "$GITHUB_STEP_SUMMARY" ] ; then

extra/get_variant_name.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
set -e
33

4+
source venv/bin/activate
5+
46
# Get the variant name (NORMALIZED_BOARD_TARGET in Zephyr)
57
tmpdir=$(mktemp -d)
6-
variant=$(cmake "-DBOARD=$1" -P extra/get_variant_name.cmake | grep 'VARIANT=' | cut -d '=' -f 2)
8+
variant=$(cmake "-DBOARD=$1" -P extra/get_variant_name.cmake 2>/dev/null | grep 'VARIANT=' | cut -d '=' -f 2)
79
rm -rf ${tmpdir}
810

911
echo $variant

0 commit comments

Comments
 (0)