@@ -104,12 +104,6 @@ jobs:
104
104
git checkout ${{ env.IDF_BRANCH }} || echo "Using master branch"
105
105
bash ./tools/check-deploy-needed.sh
106
106
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
-
113
107
- name : Install dependencies
114
108
# if: env.libs_has_commit == '0' || env.ar_has_commit == '0'
115
109
run : bash ./tools/prepare-ci.sh
@@ -129,14 +123,14 @@ jobs:
129
123
if : failure() && (env.libs_has_commit == '0' || env.ar_has_commit == '0')
130
124
uses : actions/upload-artifact@v4
131
125
with :
132
- name : build-${{ env.artifact_id }}
126
+ name : build-${{ env.libs_version }}-${{ matrix.target }}
133
127
path : build
134
128
135
129
- name : Upload library files
136
130
# if: env.libs_has_commit == '0' || env.ar_has_commit == '0'
137
131
uses : actions/upload-artifact@v4
138
132
with :
139
- name : libs-${{ env.artifact_id }}
133
+ name : libs-${{ env.libs_version }}-${{ matrix.target }}
140
134
path : dist
141
135
142
136
combine-artifacts :
@@ -161,18 +155,12 @@ jobs:
161
155
git checkout ${{ env.IDF_BRANCH }} || echo "Using master branch"
162
156
bash ./tools/check-deploy-needed.sh
163
157
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
-
170
158
- name : Download artifacts
171
159
# if: env.libs_has_commit == '0' || env.ar_has_commit == '0'
172
160
uses : actions/download-artifact@v4
173
161
with :
174
162
path : dist
175
- pattern : libs-${{ env.artifact_id }}-*
163
+ pattern : libs-${{ env.libs_version }}-*
176
164
merge-multiple : true
177
165
178
166
- name : Combine artifacts
@@ -187,6 +175,8 @@ jobs:
187
175
cat out/tools/esp32-arduino-libs/versions.txt >> out/tools/esp32-arduino-libs/versions_full.txt
188
176
done
189
177
178
+ ls -l out/tools/esp32-arduino-libs
179
+
190
180
# Merge versions.txt files
191
181
awk -i inplace '!seen[$0]++' out/tools/esp32-arduino-libs/versions_full.txt
192
182
mv -f out/tools/esp32-arduino-libs/versions_full.txt out/tools/esp32-arduino-libs/versions.txt
0 commit comments