Skip to content

Commit 235fd4b

Browse files
committed
Merge branch 'ci/cron_optimization'
2 parents 543323f + 7da05b6 commit 235fd4b

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

.github/workflows/cron.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ jobs:
3838
- name: Generate matrix
3939
id: gen-matrix
4040
run: |
41-
apt update && apt install jq
42-
4341
# Change this based on the IDF branches we want to build
4442
all_branches="[\"release/v5.1\"]"
4543
@@ -104,7 +102,9 @@ jobs:
104102
GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
105103
GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
106104
IDF_BRANCH: ${{ matrix.idf_branch }}
107-
run: bash ./tools/check-deploy-needed.sh
105+
run: |
106+
git checkout ${{ env.IDF_BRANCH }} || echo "Using master branch"
107+
bash ./tools/check-deploy-needed.sh
108108
109109
- name: Install dependencies
110110
if: env.libs_has_commit == '0' || env.ar_has_commit == '0'
@@ -119,7 +119,6 @@ jobs:
119119
TARGETS: ${{ matrix.target }}
120120
if: env.libs_has_commit == '0' || env.ar_has_commit == '0'
121121
run: |
122-
git checkout ${{ env.IDF_BRANCH }} || echo "Using master branch"
123122
bash ./tools/cron.sh
124123
125124
- name: Upload build
@@ -156,7 +155,9 @@ jobs:
156155
GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
157156
GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
158157
IDF_BRANCH: ${{ matrix.idf_branch }}
159-
run: bash ./tools/check-deploy-needed.sh
158+
run: |
159+
git checkout ${{ env.IDF_BRANCH }} || echo "Using master branch"
160+
bash ./tools/check-deploy-needed.sh
160161
161162
- name: Download artifacts
162163
if: env.libs_has_commit == '0' || env.ar_has_commit == '0'

0 commit comments

Comments
 (0)