Conversation
aa277ce to
0fd2907
Compare
- Add p2-composite.sh that builds the nightly p2 composite site by regenerating the composite metadata from a directory scan, dropping the tycho-eclipserun-plugin Eclipse runtime the old Ant task needed - Provide a guarded 'prune' subcommand to remove old nightly version lines (dry-run by default, refuses unknown tokens and total wipes) - Decouple publishing from Maven entirely: the repository pom now only builds target/repository, and the Jenkins pipeline invokes the script directly; 'add' auto-detects the version from the build output - Remove the obsolete packaging-p2composite.ant and rsync.ant
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What it does
Replaces the dated
packaging-p2composite.ant/rsync.anttasks — which spunup a full Eclipse runtime (
tycho-eclipserun-plugin, pinned to the 2019-09release repo + JavaSE-11) just to rewrite two small composite metadata files —
with a single, self-contained bash script.
releng/org.eclipse.glsp.repository/p2-composite.shthat builds thenightly p2 composite site by regenerating
compositeContent.xml/compositeArtifacts.xml/p2.indexfrom a directory scan. No Eclipse/p2tooling required.
prunesubcommand for maintenance (e.g. drop all2.xnightlies after switching to
3.x). It is dry-run by default and refusesunknown tokens, invalid tokens, and any prune that would empty the site.
target/repository, and the Jenkins pipeline invokes the script directly.The
addstep auto-detects the version from the build output, so the childdirectory name always matches the published bundle versions.
a first run and aborts on any other pull error, so a transient failure can
never lead to a destructive
rsync --deleteagainst production.packaging-p2composite.antandrsync.ant.How to test
The composite/prune logic can be exercised end-to-end against local directories
acting as the "remote" (rsync does a plain local copy when the destination has
no
host:prefix), using a real built repository as source:regeneration, and child-reference integrity (every
<child>resolves toan existing dir).
refuse-total-wipe).
an unreachable remote aborts (exit 1) before any push.
xmllint) and matches the liveEclipse composite format.
Follow-ups
Deploy P2stage'srm -rf/mkdirof the local mirror is now partlyredundant with the script's own handling; left intact to keep the diff small.
eclipse-glsp/glspIDE repo) uses the same Ant tasks andcould receive the same treatment.
Changelog