Skip to content

Commit 3d761b9

Browse files
committed
test
1 parent 6dfcb56 commit 3d761b9

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

.github/workflows/cron.yml

+5-15
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,6 @@ 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-
113107
- name: Install dependencies
114108
#if: env.libs_has_commit == '0' || env.ar_has_commit == '0'
115109
run: bash ./tools/prepare-ci.sh
@@ -129,14 +123,14 @@ jobs:
129123
if: failure() && (env.libs_has_commit == '0' || env.ar_has_commit == '0')
130124
uses: actions/upload-artifact@v4
131125
with:
132-
name: build-${{ env.artifact_id }}
126+
name: build-${{ env.libs_version }}-${{ matrix.target }}
133127
path: build
134128

135129
- name: Upload library files
136130
#if: env.libs_has_commit == '0' || env.ar_has_commit == '0'
137131
uses: actions/upload-artifact@v4
138132
with:
139-
name: libs-${{ env.artifact_id }}
133+
name: libs-${{ env.libs_version }}-${{ matrix.target }}
140134
path: dist
141135

142136
combine-artifacts:
@@ -161,18 +155,12 @@ jobs:
161155
git checkout ${{ env.IDF_BRANCH }} || echo "Using master branch"
162156
bash ./tools/check-deploy-needed.sh
163157
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-
170158
- name: Download artifacts
171159
#if: env.libs_has_commit == '0' || env.ar_has_commit == '0'
172160
uses: actions/download-artifact@v4
173161
with:
174162
path: dist
175-
pattern: libs-${{ env.artifact_id }}-*
163+
pattern: libs-${{ env.libs_version }}-*
176164
merge-multiple: true
177165

178166
- name: Combine artifacts
@@ -187,6 +175,8 @@ jobs:
187175
cat out/tools/esp32-arduino-libs/versions.txt >> out/tools/esp32-arduino-libs/versions_full.txt
188176
done
189177
178+
ls -l out/tools/esp32-arduino-libs
179+
190180
# Merge versions.txt files
191181
awk -i inplace '!seen[$0]++' out/tools/esp32-arduino-libs/versions_full.txt
192182
mv -f out/tools/esp32-arduino-libs/versions_full.txt out/tools/esp32-arduino-libs/versions.txt

0 commit comments

Comments
 (0)