Skip to content

Commit 956bc3e

Browse files
authored
fix(release): Fix release scripts (espressif#11907)
* fix(release): Update version script check if version already exists * ci(component): Update component upload action to 2.2.0 * fix(release): Update zip filename in json
1 parent ee98cf3 commit 956bc3e

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.github/ISSUE_TEMPLATE/Issue-report.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ body:
4444
- latest development Release Candidate (RC-X)
4545
- latest master (checkout manually)
4646
- v3.3.2
47-
- v3.3.2
4847
- v3.3.1
4948
- v3.3.0
5049
- v3.2.1

.github/scripts/on-release.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,8 @@ echo
433433
echo "Updating libs URLs in JSON template ..."
434434

435435
# Update all libs URLs in the JSON template
436-
libs_jq_arg="(.packages[0].tools[] | select(.name == \"esp32-arduino-libs\") | .systems[].url) = \"$LIBS_ZIP_URL\""
436+
libs_jq_arg="(.packages[0].tools[] | select(.name == \"esp32-arduino-libs\") | .systems[].url) = \"$LIBS_ZIP_URL\" |\
437+
(.packages[0].tools[] | select(.name == \"esp32-arduino-libs\") | .systems[].archiveFileName) = \"$LIBS_ZIP\""
437438

438439
cat "$PACKAGE_JSON_TEMPLATE" | jq "$libs_jq_arg" > "$OUTPUT_DIR/package-libs-updated.json"
439440
PACKAGE_JSON_TEMPLATE="$OUTPUT_DIR/package-libs-updated.json"

.github/scripts/update-version.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,13 @@ echo "New Arduino Version: $ESP_ARDUINO_VERSION"
3939
echo "ESP-IDF Version: $ESP_IDF_VERSION"
4040

4141
echo "Updating issue template..."
42-
cat .github/ISSUE_TEMPLATE/Issue-report.yml | \
43-
sed "s/.*\- latest master .*/ - latest master \(checkout manually\)\\n - v$ESP_ARDUINO_VERSION/g" > __issue-report.yml && mv __issue-report.yml .github/ISSUE_TEMPLATE/Issue-report.yml
42+
if ! grep -q "v$ESP_ARDUINO_VERSION" .github/ISSUE_TEMPLATE/Issue-report.yml; then
43+
cat .github/ISSUE_TEMPLATE/Issue-report.yml | \
44+
sed "s/.*\- latest master .*/ - latest master \(checkout manually\)\\n - v$ESP_ARDUINO_VERSION/g" > __issue-report.yml && mv __issue-report.yml .github/ISSUE_TEMPLATE/Issue-report.yml
45+
echo "Issue template updated with version v$ESP_ARDUINO_VERSION"
46+
else
47+
echo "Version v$ESP_ARDUINO_VERSION already exists in issue template, skipping update"
48+
fi
4449

4550
echo "Updating GitLab variables..."
4651
cat .gitlab/workflows/common.yml | \

.github/workflows/upload-idf-component.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ jobs:
5151
submodules: "recursive"
5252

5353
- name: Upload components to the component registry
54-
uses: espressif/upload-components-ci-action@b78a19fa5424714997596d3ecffa634aef8ae20b # v1.0.5
54+
uses: espressif/upload-components-ci-action@df9e740b912c009996df639ba7090c24e9a542c2 # v2.2.0
5555
with:
56-
name: arduino-esp32
56+
components: "arduino-esp32: ." # component_name: directory
5757
version: ${{ env.RELEASE_TAG }}
5858
namespace: espressif
5959
api_token: ${{ secrets.IDF_COMPONENT_API_TOKEN }}

0 commit comments

Comments
 (0)