Skip to content

Commit 18e877b

Browse files
lucasssvazlucasssvaz
committed
Split cron jobs using matrix
1 parent 6683a0d commit 18e877b

File tree

5 files changed

+184
-150
lines changed

5 files changed

+184
-150
lines changed

Diff for: ‎.github/workflows/cron.yml

+159-100
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name: Cron Build
22

3-
on:
3+
on:
44
schedule:
55
# ┌───────────── minute (0 - 59)
66
# │ ┌───────────── hour (0 - 23)
77
# │ │ ┌───────────── day of the month (1 - 31)
88
# │ │ │ ┌───────────── month (1 - 12 or JAN-DEC)
99
# │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
10-
# │ │ │ │ │
10+
# │ │ │ │ │
1111
# │ │ │ │ │
1212
# │ │ │ │ │
1313
# * * * * *
@@ -17,128 +17,187 @@ defaults:
1717
run:
1818
shell: bash
1919

20+
env:
21+
LATEST_RELEASE_BRANCH: "release/v5.1" # Change this to the latest release branch so the checkouts are done correctly
22+
2023
jobs:
21-
run:
22-
name: Build with IDF ${{ matrix.idf_branch }}
24+
gen-matrix:
25+
name: Generate matrix
2326
runs-on: ubuntu-latest
24-
27+
outputs:
28+
matrix: ${{ steps.gen-matrix.outputs.matrix }}
29+
branches: ${{ steps.gen-matrix.outputs.branches }}
30+
steps:
31+
- uses: actions/checkout@v4
32+
with:
33+
fetch-depth: 0
34+
35+
- name: Generate matrix
36+
id: gen-matrix
37+
env:
38+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39+
run: |
40+
set -e
41+
42+
# Change this based on the IDF branches we want to build. Don't forget to update env.LATEST_RELEASE_BRANCH
43+
all_branches=("release/v5.1")
44+
45+
# Change this based on the COMMON targets for all branches we want to build.
46+
common_targets="[\"esp32\", \"esp32s2\", \"esp32s3\", \"esp32c2\", \"esp32c3\", \"esp32c6\", \"esp32h2\"]"
47+
48+
# For additional targets per branch, add them here
49+
additional_targets="[{\"idf_branch\": \"release/v5.3\", \"target\": \"esp32p4\"}]"
50+
51+
branches="["
52+
matrix="{"
53+
54+
for branch in ${all_branches[@]}; do
55+
if [ "$branch" == "$LATEST_RELEASE_BRANCH" ]; then
56+
git checkout master
57+
else
58+
git checkout $branch
59+
fi
60+
export IDF_BRANCH=$branch
61+
source ./tools/check-deploy-needed.sh
62+
if [ "$DEPLOY_NEEDED" == "1" ]; then
63+
branches+="\"$branch\","
64+
fi
65+
done
66+
67+
branches="${branches%,}]"
68+
matrix+="\"idf_branch\": $branches,"
69+
matrix+="\"target\": $common_targets,"
70+
71+
matrix+="\"include\": "
72+
# Add all additional targets that are in the selected branches
73+
matrix+=$(echo $additional_targets | jq --argjson branches "$branches" '[.[] | select(.idf_branch as $branch | $branches | index($branch))]')
74+
75+
matrix+="}"
76+
77+
echo "Branches: $branches"
78+
79+
echo "Matrix:"
80+
echo "$matrix" | jq .
81+
82+
if [ ! -x $GITHUB_OUTPUT ]; then
83+
echo "matrix=$matrix" >> $GITHUB_OUTPUT
84+
echo "branches=$branches" >> $GITHUB_OUTPUT
85+
fi
86+
87+
build-libs:
88+
name: Build with IDF ${{ matrix.idf_branch }} for ${{ matrix.target }}
89+
runs-on: ubuntu-latest
90+
if: needs.gen-matrix.outputs.branches != '[]'
91+
needs: gen-matrix
2592
strategy:
2693
fail-fast: false
27-
matrix:
28-
idf_branch: [release/v5.1, release/v4.4] #, release/v3.3]
94+
matrix: ${{ fromJson(needs.gen-matrix.outputs.matrix) }}
2995
steps:
3096
- uses: actions/checkout@v4
3197
with:
32-
fetch-depth: 0
98+
# Useful workaround for the checkout action to work with the matrix
99+
# https://github.com/actions/runner/issues/409#issuecomment-1013325196
100+
ref: ${{ matrix.idf_branch == env.LATEST_RELEASE_BRANCH && 'master' || matrix.idf_branch }}
101+
33102
- name: Install dependencies
34103
run: bash ./tools/prepare-ci.sh
104+
35105
- name: Build
36106
env:
37-
GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
107+
GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN || secrets.GITHUB_TOKEN }}
38108
GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
39109
GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
40110
IDF_BRANCH: ${{ matrix.idf_branch }}
111+
TARGET: ${{ matrix.target }}
41112
run: |
42-
git checkout ${{ matrix.idf_branch }} || echo "Using master branch"
43113
bash ./tools/cron.sh
114+
115+
- name: Replace invalid characters in the artifact name
116+
run: |
117+
branch=${{ matrix.idf_branch }}
118+
echo "libs_branch=${branch//\//_}" >> $GITHUB_ENV
119+
44120
- name: Upload build
45121
if: failure()
46122
uses: actions/upload-artifact@v4
47123
with:
48-
name: build
124+
name: build-${{ env.libs_branch }}-${{ matrix.target }}
49125
path: build
50-
- name: Upload archive
126+
127+
- name: Upload library files
51128
uses: actions/upload-artifact@v4
52129
with:
53-
name: artifacts
130+
name: libs-${{ env.libs_branch }}-${{ matrix.target }}
54131
path: dist
55132

133+
combine-artifacts:
134+
name: Combine artifacts for IDF ${{ matrix.idf_branch }}
135+
runs-on: ubuntu-latest
136+
needs: [gen-matrix, build-libs]
137+
# Condition is evaluated before the job is run so it won't cause a failure
138+
if: needs.gen-matrix.outputs.branches != '[]'
139+
strategy:
140+
fail-fast: false
141+
matrix:
142+
idf_branch: ${{ fromJson(needs.gen-matrix.outputs.branches) }}
143+
steps:
144+
- uses: actions/checkout@v4
145+
with:
146+
# Useful workaround for the checkout action to work with the matrix
147+
# https://github.com/actions/runner/issues/409#issuecomment-1013325196
148+
ref: ${{ matrix.idf_branch == env.LATEST_RELEASE_BRANCH && 'master' || matrix.idf_branch }}
149+
150+
- name: Replace invalid characters in the artifact name
151+
run: |
152+
branch=${{ matrix.idf_branch }}
153+
echo "libs_branch=${branch//\//_}" >> $GITHUB_ENV
154+
155+
- name: Download artifacts
156+
uses: actions/download-artifact@v4
157+
with:
158+
path: dist
159+
pattern: libs-${{ env.libs_branch }}-*
160+
merge-multiple: true
161+
162+
- name: Combine artifacts
163+
run: |
164+
set -e
165+
mkdir -p out
166+
167+
libs_folder="out/tools/esp32-arduino-libs"
168+
169+
files=$(find dist -name 'arduino-esp32-libs-esp*.tar.gz')
170+
for file in $files; do
171+
echo "Extracting $file"
172+
tar zxvf $file -C out
173+
cat $libs_folder/versions.txt >> $libs_folder/versions_full.txt
174+
done
175+
176+
# Merge versions.txt files
177+
awk -i inplace '!seen[$0]++' $libs_folder/versions_full.txt
178+
mv -f $libs_folder/versions_full.txt $libs_folder/versions.txt
179+
180+
cd $libs_folder && tar zcf ../../../dist/esp32-arduino-libs.tar.gz * && cd ../../..
181+
cp out/package_esp32_index.template.json dist/package_esp32_index.template.json
182+
183+
- name: Upload full esp32-arduino-libs archive
184+
uses: actions/upload-artifact@v4
185+
with:
186+
name: esp32-arduino-libs
187+
path: dist/esp32-arduino-libs.tar.gz
56188

57-
# check:
58-
# name: Check if result should be deployed
59-
# runs-on: ubuntu-latest
60-
# strategy:
61-
# matrix:
62-
# branch: [release/v5.1, release/v4.4] #, release/v3.3]
63-
# outputs:
64-
# idf_branch: ${{ steps.check.outputs.idf_branch }}
65-
# idf_commit: ${{ steps.check.outputs.idf_commit }}
66-
# ar_branch: ${{ steps.check.outputs.ar_branch }}
67-
# ar_new_commit_message: ${{ steps.check.outputs.ar_new_commit_message }}
68-
# ar_new_branch_name: ${{ steps.check.outputs.ar_new_branch_name }}
69-
# ar_new_pr_title: ${{ steps.check.outputs.ar_new_pr_title }}
70-
# ar_has_commit: ${{ steps.check.outputs.ar_has_commit }}
71-
# ar_has_branch: ${{ steps.check.outputs.ar_has_branch }}
72-
# ar_has_pr: ${{ steps.check.outputs.ar_has_pr }}
73-
# libs_version: ${{ steps.check.outputs.libs_version }}
74-
# libs_has_commit: ${{ steps.check.outputs.libs_has_commit }}
75-
# libs_has_branch: ${{ steps.check.outputs.libs_has_branch }}
76-
# steps:
77-
# - uses: actions/checkout@v3
78-
# - id: check
79-
# env:
80-
# GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
81-
# GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
82-
# GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
83-
# IDF_BRANCH: ${{ matrix.idf_branch }}
84-
# run: bash ./tools/check-deploy-needed.sh
85-
86-
# build:
87-
# name: Build Libs for ${{ matrix.target }}
88-
# runs-on: ubuntu-latest
89-
# needs: check
90-
# if: needs.check.outputs.libs_has_commit == '0' || needs.check.outputs.ar_has_commit == '0'
91-
# strategy:
92-
# matrix:
93-
# target: [esp32, esp32s2, esp32s3, esp32c3, esp32c6, esp32h2]
94-
# fail-fast: false
95-
# steps:
96-
# - uses: actions/checkout@v3
97-
# # - name: Install dependencies
98-
# # run: bash ./tools/prepare-ci.sh
99-
# - shell: bash
100-
# name: Build Libs for ${{ matrix.target }}
101-
# run: echo ${{ matrix.target }}
102-
# # run: bash ./build.sh -t ${{ matrix.target }}
103-
# # - name: Upload archive
104-
# # uses: actions/upload-artifact@v3
105-
# # with:
106-
# # name: artifacts
107-
# # path: dist
108-
109-
# deploy:
110-
# name: Deploy build
111-
# runs-on: ubuntu-latest
112-
# needs: [check, build]
113-
# steps:
114-
# - uses: actions/checkout@v3
115-
# - shell: bash
116-
# env:
117-
# GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
118-
# GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
119-
# GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
120-
# IDF_BRANCH: ${{ needs.check.outputs.idf_branch }}
121-
# IDF_COMMIT: ${{ needs.check.outputs.idf_commit }}
122-
# AR_BRANCH: ${{ needs.check.outputs.ar_branch }}
123-
# AR_NEW_COMMIT_MESSAGE: ${{ needs.check.outputs.ar_new_commit_message }}
124-
# AR_NEW_BRANCH_NAME: ${{ needs.check.outputs.ar_new_branch_name }}
125-
# AR_NEW_PR_TITLE: ${{ needs.check.outputs.ar_new_pr_title }}
126-
# AR_HAS_COMMIT: ${{ needs.check.outputs.ar_has_commit }}
127-
# AR_HAS_BRANCH: ${{ needs.check.outputs.ar_has_branch }}
128-
# AR_HAS_PR: ${{ needs.check.outputs.ar_has_pr }}
129-
# LIBS_VERSION: ${{ needs.check.outputs.libs_version }}
130-
# LIBS_HAS_COMMIT: ${{ needs.check.outputs.libs_has_commit }}
131-
# LIBS_HAS_BRANCH: ${{ needs.check.outputs.libs_has_branch }}
132-
# run: |
133-
# echo "IDF_COMMIT: $IDF_COMMIT"
134-
# echo "AR_BRANCH: $AR_BRANCH"
135-
# echo "AR_NEW_COMMIT_MESSAGE: $AR_NEW_COMMIT_MESSAGE"
136-
# echo "AR_NEW_BRANCH_NAME: $AR_NEW_BRANCH_NAME"
137-
# echo "AR_NEW_PR_TITLE: $AR_NEW_PR_TITLE"
138-
# echo "AR_HAS_COMMIT: $AR_HAS_COMMIT"
139-
# echo "AR_HAS_BRANCH: $AR_HAS_BRANCH"
140-
# echo "AR_HAS_PR: $AR_HAS_PR"
141-
# echo "LIBS_VERSION: $LIBS_VERSION"
142-
# echo "LIBS_HAS_COMMIT: $LIBS_HAS_COMMIT"
143-
# echo "LIBS_HAS_BRANCH: $LIBS_HAS_BRANCH"
189+
- name: Upload package_esp32_index.template.json
190+
uses: actions/upload-artifact@v4
191+
with:
192+
name: package-esp32-index-json
193+
path: dist/package_esp32_index.template.json
144194

195+
- name: Push changes
196+
if: github.repository == 'espressif/esp32-arduino-lib-builder'
197+
env:
198+
GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
199+
GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
200+
GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
201+
IDF_BRANCH: ${{ matrix.idf_branch }}
202+
run: |
203+
bash ./tools/push-to-arduino.sh

Diff for: ‎build.sh

+5
Original file line numberDiff line numberDiff line change
@@ -299,13 +299,15 @@ done
299299

300300
# update package_esp32_index.template.json
301301
if [ "$BUILD_TYPE" = "all" ]; then
302+
echo "* Generating package_esp32_index.template.json..."
302303
python3 ./tools/gen_tools_json.py -i "$IDF_PATH" -j "$AR_COMPS/arduino/package/package_esp32_index.template.json" -o "$AR_OUT/"
303304
python3 ./tools/gen_tools_json.py -i "$IDF_PATH" -o "$TOOLS_JSON_OUT/"
304305
if [ $? -ne 0 ]; then exit 1; fi
305306
fi
306307

307308
# Generate PlatformIO manifest file
308309
if [ "$BUILD_TYPE" = "all" ]; then
310+
echo "* Generating PlatformIO manifest file..."
309311
pushd $IDF_PATH
310312
ibr=$(git describe --all 2>/dev/null)
311313
ic=$(git -C "$IDF_PATH" rev-parse --short HEAD)
@@ -316,18 +318,21 @@ fi
316318

317319
# copy everything to arduino-esp32 installation
318320
if [ $COPY_OUT -eq 1 ] && [ -d "$ESP32_ARDUINO" ]; then
321+
echo "* Copying to Arduino..."
319322
./tools/copy-to-arduino.sh
320323
if [ $? -ne 0 ]; then exit 1; fi
321324
fi
322325

323326
# push changes to esp32-arduino-libs and create pull request into arduino-esp32
324327
if [ $DEPLOY_OUT -eq 1 ]; then
328+
echo "* Pushing to Arduino..."
325329
./tools/push-to-arduino.sh
326330
if [ $? -ne 0 ]; then exit 1; fi
327331
fi
328332

329333
# archive the build
330334
if [ $ARCHIVE_OUT -eq 1 ]; then
335+
echo "* Archiving build..."
331336
./tools/archive-build.sh "$TARGET"
332337
if [ $? -ne 0 ]; then exit 1; fi
333338
fi

Diff for: ‎tools/check-deploy-needed.sh

+13
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ source ./tools/config.sh
44

55
IDF_COMMIT=`github_last_commit "$IDF_REPO" "$IDF_BRANCH"`
66

7+
if [ -z $IDF_COMMIT ]; then
8+
echo "Failed to get IDF commit for branch $IDF_BRANCH"
9+
exit 1
10+
fi
11+
712
if [ -z $GITHUB_HEAD_REF ]; then
813
current_branch=`git branch --show-current`
914
else
@@ -83,3 +88,11 @@ if [ ! -x $GITHUB_OUTPUT ]; then
8388
echo "libs_has_commit=$LIBS_HAS_COMMIT" >> "$GITHUB_OUTPUT"
8489
echo "libs_has_branch=$LIBS_HAS_BRANCH" >> "$GITHUB_OUTPUT"
8590
fi
91+
92+
if [ "$LIBS_HAS_COMMIT" == "0" ] || [ "$AR_HAS_COMMIT" == "0" ]; then
93+
echo "Deploy needed"
94+
export DEPLOY_NEEDED="1"
95+
else
96+
echo "Deploy not needed. Skipping..."
97+
export DEPLOY_NEEDED="0"
98+
fi

Diff for: ‎tools/cron.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,10 @@ if [ ! "$GITHUB_EVENT_NAME" == "schedule" ]; then
55
exit 1
66
fi
77

8-
bash ./build.sh -d
8+
if [ -z "$TARGET" ]; then
9+
TARGET="all"
10+
fi
11+
12+
export IDF_CCACHE_ENABLE=1
13+
14+
bash ./build.sh -e -t $TARGET

0 commit comments

Comments
 (0)