Skip to content

Commit 011e7d6

Browse files
committed
Undo bump of org.eclipse.cdt.native.serial
Added explanation to RELEASING.md + the script itself so that the next person doesn't have as much of a struggle here.
1 parent 0443a85 commit 011e7d6

3 files changed

Lines changed: 3 additions & 1 deletion

File tree

RELEASING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ find $CDT_ROOT -type f -name MANIFEST.MF -exec sed -i s/12.2.0.qualifier/12.3.0.
5555
- Then in the launched bash (we stay in the bash shell so that we don't have to download dependencies repeatedly):
5656
- update dependency version `mvn org.eclipse.tycho.extras:tycho-version-bump-plugin:update-manifest`
5757
- bump bundle versions for compare and replace `mvn verify org.eclipse.tycho:tycho-versions-plugin:bump-versions -Dtycho.bump-versions.increment=100 -DskipDoc=true -DskipTests=true -P baseline-compare-and-replace -fae -Djgit.dirtyWorkingTree-cdtDefault=warning` <-- simply running this over and over again sometimes doesn't work and a manual version bump may be needed
58+
- "unbump" `org.eclipse.cdt.native.serial`'s dependency on `org.eclipse.cdt.core.native` unless the dependency really needs updating - if it really needs updating `releng/scripts/do_rebuild_natives.sh` will probably fail because the script tries to run just the one bundle, so sees an older version of `org.eclipse.cdt.core.native`.
5859
- create a PR with all the above against the new branch - see https://github.com/eclipse-cdt/cdt/pull/1184 for a past example
5960
- merge the PR once it is clean
6061
- wait for the build on the branch to complete that has this change https://ci.eclipse.org/cdt/job/cdt/job/cdt_12_1/

releng/scripts/do_rebuild_natives.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ for p in serial/org.eclipse.cdt.native.serial core/org.eclipse.cdt.core.native;
2828
logfile=jni-headers-${p//\//-}.log
2929
if ! ${MVN:-mvn} -B -V process-resources -P jniheaders -f $p >${logfile} 2>&1; then
3030
echo "Rebuilding of $p JNI headers failed. The log (${logfile}) is part of the artifacts of the build"
31+
echo "If this fails with a message like Missing requirement: org.eclipse.cdt.native.serial 12.3.0.qualifier requires 'osgi.bundle; org.eclipse.cdt.core.native [6.6.0,7.0.0)' but it could not be found: See log for details then see RELEASING.md for info"
3132
exit 1
3233
fi
3334

serial/org.eclipse.cdt.native.serial/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
88
Export-Package: org.eclipse.cdt.serial
99
Automatic-Module-Name: org.eclipse.cdt.native.serial
1010
Bundle-Localization: plugin
11-
Require-Bundle: org.eclipse.cdt.core.native;bundle-version="[6.6.0,7.0.0)"
11+
Require-Bundle: org.eclipse.cdt.core.native;bundle-version="[6.5.0,7.0.0)"

0 commit comments

Comments
 (0)