Skip to content

Commit 51de3df

Browse files
committed
Merge branch 'ci/cron_optimization'
2 parents 25a0bb5 + 4e24823 commit 51de3df

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

.github/workflows/cron.yml

+15-3
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@ jobs:
104104
git checkout ${{ env.IDF_BRANCH }} || echo "Using master branch"
105105
bash ./tools/check-deploy-needed.sh
106106
107+
- name: Create artifact id
108+
id: artifact_id
109+
run: |
110+
artifact_id=${{ matrix.idf_branch }}-${{ matrix.target }}
111+
echo "artifact_id=${artifact_id////_}" >> $GITHUB_ENV
112+
107113
- name: Install dependencies
108114
#if: env.libs_has_commit == '0' || env.ar_has_commit == '0'
109115
run: bash ./tools/prepare-ci.sh
@@ -123,14 +129,14 @@ jobs:
123129
if: failure() && (env.libs_has_commit == '0' || env.ar_has_commit == '0')
124130
uses: actions/upload-artifact@v4
125131
with:
126-
name: build-${{ matrix.idf_branch }}-${{ matrix.target }}
132+
name: build-${{ steps.artifact_id.outputs.artifact_id }}
127133
path: build
128134

129135
- name: Upload library files
130136
#if: env.libs_has_commit == '0' || env.ar_has_commit == '0'
131137
uses: actions/upload-artifact@v4
132138
with:
133-
name: libs-${{ matrix.idf_branch }}-${{ matrix.target }}
139+
name: libs-${{ steps.artifact_id.outputs.artifact_id }}
134140
path: dist
135141

136142
combine-artifacts:
@@ -155,12 +161,18 @@ jobs:
155161
git checkout ${{ env.IDF_BRANCH }} || echo "Using master branch"
156162
bash ./tools/check-deploy-needed.sh
157163
164+
- name: Create artifact id
165+
id: artifact_id
166+
run: |
167+
artifact_id=${{ matrix.idf_branch }}
168+
echo "artifact_id=${artifact_id////_}" >> $GITHUB_ENV
169+
158170
- name: Download artifacts
159171
#if: env.libs_has_commit == '0' || env.ar_has_commit == '0'
160172
uses: actions/download-artifact@v4
161173
with:
162174
path: dist
163-
pattern: libs-${{ matrix.idf_branch }}-*
175+
pattern: libs-${{ steps.artifact_id.outputs.artifact_id }}-*
164176
merge-multiple: true
165177

166178
- name: Combine artifacts

0 commit comments

Comments
 (0)