v3.7.1 #1365
v3.7.1 #1365
Conversation
WalkthroughVersion bump from 3.7.0 to 3.7.1 across manifest, feature, and product files. A new CI workflow step added to regenerate P2 repository metadata after macOS JAR signing to ensure SHA-512 hashes are updated correctly. Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~8 minutes
Possibly related PRs
Suggested reviewers
Poem
Pre-merge checks and finishing touches❌ Failed checks (1 inconclusive)
✅ Passed checks (2 passed)
✨ Finishing touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (1)
.github/workflows/ci_release.yml (1)
118-128: Consider adding error handling for metadata regeneration failure.If both the primary and fallback
mvncommands fail, the workflow will continue silently (due to the||only covering the fallback attempt). Since P2 metadata integrity is critical for update sites, consider adding explicit failure handling.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 \ + if ! 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 + -DskipTests=true; then + echo "Retrying without explicit repositoryPath..." + mvn -f releng/com.espressif.idf.update/pom.xml \ + org.eclipse.tycho:tycho-p2-repository-plugin:fix-artifacts-metadata \ + -DskipTests=true + fi echo "P2 metadata updated with correct hashes for signed JARs"
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (5)
.github/workflows/ci_release.yml(1 hunks)bundles/com.espressif.idf.branding/META-INF/MANIFEST.MF(1 hunks)features/com.espressif.idf.feature/feature.xml(1 hunks)releng/com.espressif.idf.configuration/pom.xml(1 hunks)releng/com.espressif.idf.product/idf.product(1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (3)
- GitHub Check: build_windows
- GitHub Check: build_macos
- GitHub Check: build
🔇 Additional comments (4)
bundles/com.espressif.idf.branding/META-INF/MANIFEST.MF (1)
5-5: Version bump looks correct.The
Bundle-Versionupdate to3.7.1.qualifieris consistent with the version changes across the other files in this PR (pom.xml, feature.xml, idf.product).releng/com.espressif.idf.configuration/pom.xml (1)
13-13: Version property update is consistent.The
espressif-ide-release-versionproperty update to3.7.1aligns with the version bumps in the manifest, feature, and product files.releng/com.espressif.idf.product/idf.product (1)
4-4: Product version update is correct.The product version
3.7.1is consistent with the coordinated version bump across all project files.features/com.espressif.idf.feature/feature.xml (1)
5-5: Feature version update is consistent.The feature version
3.7.1.qualifieraligns with the bundle manifest and product version updates.
| - 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" |
There was a problem hiding this comment.
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=trueMove 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.
Description
Please include a summary of the change and which issue is fixed.
Fixes # (IEP-XXX)
Type of change
Please delete options that are not relevant.
How has this been tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Test Configuration:
Dependent components impacted by this PR:
Checklist
Summary by CodeRabbit
✏️ Tip: You can customize this high-level summary in your review settings.