Skip to content
Merged

v3.7.1 #1365

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .github/workflows/ci_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,27 @@ jobs:
jarsigner -verify -verbose "$file" || true
done

- name: Regenerate P2 metadata after signing
env:
MAVEN_OPTS: "-Djdk.xml.maxGeneralEntitySizeLimit=0 -Djdk.xml.maxParameterEntitySizeLimit=0 -Djdk.xml.totalEntitySizeLimit=0 -Djdk.xml.entityExpansionLimit=0"
run: |
# Regenerate P2 metadata to update hashes for signed JARs
# This ensures the SHA-512 hashes in metadata match the signed JAR files
# Use Tycho's fix-artifacts-metadata goal to update metadata without rebuilding artifacts
REPO_DIR="releng/com.espressif.idf.update/target/repository"

echo "Updating P2 metadata for signed JARs in $REPO_DIR..."
mvn -f releng/com.espressif.idf.update/pom.xml \
org.eclipse.tycho:tycho-p2-repository-plugin:fix-artifacts-metadata \
-DrepositoryPath="$REPO_DIR" \
-DskipTests=true || \
# Fallback: try without explicit path (auto-detect)
mvn -f releng/com.espressif.idf.update/pom.xml \
org.eclipse.tycho:tycho-p2-repository-plugin:fix-artifacts-metadata \
-DskipTests=true

echo "P2 metadata updated with correct hashes for signed JARs"
Comment on lines +111 to +130

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Good addition for P2 metadata integrity, but the fallback logic has a shell syntax issue.

The step correctly addresses the need to update P2 repository hashes after JAR signing. However, the shell comment on line 125 placed between || \ and the fallback command will cause issues. In bash, \ continues to the next physical line, which would make the comment part of the command syntax.

Apply this diff to fix the syntax:

           mvn -f releng/com.espressif.idf.update/pom.xml \
             org.eclipse.tycho:tycho-p2-repository-plugin:fix-artifacts-metadata \
             -DrepositoryPath="$REPO_DIR" \
-            -DskipTests=true || \
-          # Fallback: try without explicit path (auto-detect)
-          mvn -f releng/com.espressif.idf.update/pom.xml \
+            -DskipTests=true || \
+          mvn -f releng/com.espressif.idf.update/pom.xml \
             org.eclipse.tycho:tycho-p2-repository-plugin:fix-artifacts-metadata \
             -DskipTests=true

Move the comment above the entire block or remove it, as it cannot be placed within the || continuation.

Committable suggestion skipped: line range outside the PR's diff.

🤖 Prompt for AI Agents
.github/workflows/ci_release.yml around lines 111 to 130: a shell syntax error
is caused by placing a comment between the line-continuation backslash and the
fallback command after `|| \`; move the comment out of the continuation (either
remove it or place it above the mvn block) so the `||` fallback is a valid shell
construct and ensure the fallback mvn command is on the next physical line
without an intervening comment.


- name: Cleanup
if: always()
run: |
Expand Down
2 changes: 1 addition & 1 deletion bundles/com.espressif.idf.branding/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: com.espressif.idf.branding;singleton:=true
Bundle-Version: 3.7.0.qualifier
Bundle-Version: 3.7.1.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-17
2 changes: 1 addition & 1 deletion features/com.espressif.idf.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.espressif.idf.feature"
label="ESP-IDF Plugins for Eclipse"
version="3.7.0.qualifier"
version="3.7.1.qualifier"
provider-name="ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD"
plugin="com.espressif.idf.branding">

Expand Down
2 changes: 1 addition & 1 deletion releng/com.espressif.idf.configuration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<tycho-version>4.0.12</tycho-version>
<tycho-extras.version>${tycho-version}</tycho-extras.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<espressif-ide-release-version>3.7.0</espressif-ide-release-version>
<espressif-ide-release-version>3.7.1</espressif-ide-release-version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion releng/com.espressif.idf.product/idf.product
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Espressif-IDE" uid="com.espressif.idf.product" id="com.espressif.idf.branding.idf" application="org.eclipse.ui.ide.workbench" version="3.7.0" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
<product name="Espressif-IDE" uid="com.espressif.idf.product" id="com.espressif.idf.branding.idf" application="org.eclipse.ui.ide.workbench" version="3.7.1" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">

<aboutInfo>
<image path="/com.espressif.idf.branding/icons/alt_about.png"/>
Expand Down
Loading