diff --git a/.gitignore b/.gitignore index aef8816c..3e05536c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ workspace/ build.log .tycho-consumer-pom.xml /.settings/ +sanity-check/ diff --git a/RELEASING.md b/RELEASING.md index 2b0892b6..33971b9f 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -3,7 +3,7 @@ This guide contains the step-by-step process to complete an EPP release and assumes that you have an IDE provisioned using the [Oomph setup]( https://github.com/eclipse-packaging/packages/blob/master/CONTRIBUTING.md#create-an-eclipse-development-environment). -**Before** copying this file to create a new issue titled `EPP 2026-03 M2` with label `endgame`, update the names and versions, including those in this document. +**Before** copying this file to create a new issue titled `EPP 2026-03 M3` with label `endgame`, update the names and versions, including those in this document. - [ ] To update names and versions, edit [org.eclipse.epp.releng.updater.Updater]( releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/src/org/eclipse/epp/releng/updater/Updater.java ) to set the values of `MILESTONE`, `PLATFORM_VERSION`, and possibly `EXECUTION_ENVIRONMENT` to the current appropriate values. @@ -111,9 +111,9 @@ Scroll down for the per-milestone/RC steps. TODO: it may be possible to work around this error by always using a different random ID when doing the notarization. - [ ] Sanity check the build for the following: - [ ] Download a package from the build's [staging output](https://download.eclipse.org/technology/epp/staging/). - - [ ] Make sure filenames contain expected build name and milestone, e.g., `2026-03-M2`. + - [ ] Make sure filenames contain expected build name and milestone, e.g., `2026-03-M3`. - [ ] Splash screen says the expected release name with no milestone, e.g., `2026-03`. - - [ ] `Help -> About` says the expected build name and milestone, e.g., `2026-03-M2`. + - [ ] `Help -> About` says the expected build name and milestone, e.g., `2026-03-M3`. - [ ] From the `Console`, open the `Host OSGi console` and use `ss -s INSTALLED` to verify that there are no bundles failing to resolve. - [ ] The `org.eclipse.epp.package.*` features and bundles have the timestamp of the forced qualifier update or later. - [ ] Upgrade from previous release works. @@ -130,7 +130,7 @@ Scroll down for the per-milestone/RC steps. (especially justj, update [remove-justj-from-p2.xml](https://github.com/eclipse-packaging/packages/blob/master/releng/org.eclipse.epp.config/tools/remove-justj-from-p2.xml) if needed). - [ ] Edit the [Jenkins build](https://ci.eclipse.org/packaging/job/epp/job/master/lastBuild/). - [ ] Mark build as Keep forever. - - [ ] Edit Jenkins Build Information and name it, e.g., `2026-03 M2`. + - [ ] Edit Jenkins Build Information and name it, e.g., `2026-03 M3`. - [ ] Run the [Promote a Build]( https://ci.eclipse.org/packaging/job/promote-a-build/ ) CI job to prepare build artifacts and copy them to download.eclipse.org. @@ -160,7 +160,7 @@ This applies to all releases, i.e. M1, M2, M3, RC1 and R. Everything except R is typically the Friday around 9:30am Ottawa time and the R is the following Wednesday sometime before 10am in coordination with the SimRel release engineer. - [ ] Check that this worked: - copy the composite\*M2.jar files over the composite\*.jar files in https://download.eclipse.org/technology/epp/packages/2026-03/ - + copy the composite\*M3.jar files over the composite\*.jar files in https://download.eclipse.org/technology/epp/packages/2026-03/ - this is done automatically with the [EPP Make Visible job](https://ci.eclipse.org/packaging/job/epp-makeVisible/) which is automatically triggered by SimRel's diff --git a/packages/org.eclipse.epp.package.committers.feature/epp.website.xml b/packages/org.eclipse.epp.package.committers.feature/epp.website.xml index 3e1f116d..7bb97a24 100644 --- a/packages/org.eclipse.epp.package.committers.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.committers.feature/epp.website.xml @@ -34,6 +34,6 @@ Click here to open a b - + diff --git a/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml b/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml index 44de1c2e..b6f31155 100644 --- a/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml @@ -22,6 +22,6 @@ - + diff --git a/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml b/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml index 2dc2664e..4dbe41a2 100644 --- a/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml @@ -27,6 +27,6 @@ - + diff --git a/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml b/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml index 0ad499d5..30274a05 100644 --- a/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml @@ -29,6 +29,6 @@ To avoid compatibility issues with pre 6.x plug-ins, it is recommended to cre - + diff --git a/packages/org.eclipse.epp.package.java.feature/epp.website.xml b/packages/org.eclipse.epp.package.java.feature/epp.website.xml index dfc357cc..6cbcb0ae 100644 --- a/packages/org.eclipse.epp.package.java.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.java.feature/epp.website.xml @@ -28,6 +28,6 @@ - + diff --git a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml index 2eb44b9a..6fa3feca 100644 --- a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml @@ -34,6 +34,6 @@ Click + diff --git a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml index 65f2f001..17bb04cb 100644 --- a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml @@ -24,6 +24,6 @@ - + diff --git a/packages/org.eclipse.epp.package.php.feature/epp.website.xml b/packages/org.eclipse.epp.package.php.feature/epp.website.xml index b7beaaa9..2e08cba2 100644 --- a/packages/org.eclipse.epp.package.php.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.php.feature/epp.website.xml @@ -32,6 +32,6 @@ Click + diff --git a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml index d3236f6a..8191511e 100644 --- a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml @@ -27,6 +27,6 @@ - + diff --git a/packages/org.eclipse.epp.package.scout.feature/epp.website.xml b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml index 3af6714a..2550ecac 100644 --- a/packages/org.eclipse.epp.package.scout.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml @@ -31,6 +31,6 @@ - + diff --git a/releng/org.eclipse.epp.config/oomph/EPP.setup b/releng/org.eclipse.epp.config/oomph/EPP.setup index e4185615..48923044 100644 --- a/releng/org.eclipse.epp.config/oomph/EPP.setup +++ b/releng/org.eclipse.epp.config/oomph/EPP.setup @@ -449,6 +449,26 @@ + + + <?xml version="1.0" encoding="UTF-8" standalone="no"?> + <launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType"> + <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/> + <mapAttribute key="org.eclipse.debug.core.environmentVariables"> + <mapEntry key="PATH" value="C:\Program Files\Git\bin;$${env_var:PATH}"/> + </mapAttribute> + <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> + <listEntry value="org.eclipse.ui.externaltools.launchGroup"/> + </listAttribute> + <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\Program Files\Git\bin\bash.exe"/> + <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;releng/org.eclipse.epp.config/tools/prepareStagingSanityCheck \&#13;&#10; modeling \&#13;&#10;committers \&#13;&#10;$${system_property:osgi.os} \&#13;&#10;$${system_property:osgi.ws} \&#13;&#10;$${system_property:osgi.arch} \&#13;&#10;&quot;"/> + <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="$${workspace_loc:/org.eclipse.epp.packages}"/> + </launchConfiguration> + + + @@ -529,6 +549,34 @@ + + + <?xml version="1.0" encoding="UTF-8" standalone="no"?> + <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> + <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/> + <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> + <listEntry value="/org.eclipse.epp.releng.updater/src/org/eclipse/epp/releng/updater/Updater.java"/> + </listAttribute> + <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> + <listEntry value="1"/> + </listAttribute> + <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> + <listEntry value="org.eclipse.debug.ui.launchGroup.run"/> + </listAttribute> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/> + <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/> + <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.epp.releng.updater.Updater"/> + <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.epp.releng.updater"/> + <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-send-email"/> + <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.epp.releng.updater"/> + </launchConfiguration> + + + @@ -696,12 +744,14 @@ <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Update Versions&quot;/&gt;&#10;"/> <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Update to Milestone Repository&quot;/&gt;&#10;"/> <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Update to Staging Repository&quot;/&gt;&#10;"/> + <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Send EMail&quot;/&gt;&#10;"/> </mruHistory> <favorites> <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Open Issue&quot;/&gt;&#10;"/> <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Update Versions&quot;/&gt;&#10;"/> <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Update to Milestone Repository&quot;/&gt;&#10;"/> <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Update to Staging Repository&quot;/&gt;&#10;"/> + <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Send EMail&quot;/&gt;&#10;"/> </favorites> </launchGroup> <launchGroup id="org.eclipse.ui.externaltools.launchGroup"> diff --git a/releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/src/org/eclipse/epp/releng/updater/Updater.java b/releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/src/org/eclipse/epp/releng/updater/Updater.java index 6af39211..da15c5c6 100644 --- a/releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/src/org/eclipse/epp/releng/updater/Updater.java +++ b/releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/src/org/eclipse/epp/releng/updater/Updater.java @@ -18,7 +18,6 @@ import java.net.URLEncoder; import java.net.http.HttpClient; import java.net.http.HttpRequest; -import java.net.http.HttpResponse; import java.net.http.HttpResponse.BodyHandlers; import java.nio.charset.StandardCharsets; import java.nio.file.FileVisitResult; @@ -40,7 +39,7 @@ public class Updater { /** * M1, M2, M3, RC1, RC2 */ - private static final String MILESTONE = "M2"; + private static final String MILESTONE = "M3"; private static final String PLATFORM_VERSION = "4.39"; @@ -74,14 +73,16 @@ public class Updater { private Path root; public static void main(String[] args) throws IOException { - List arguments = List.of(args); + var arguments = List.of(args); var currentWorkingDirectory = Path.of(".").toRealPath(); if (!currentWorkingDirectory.toString().replace("\\", "/") .endsWith("releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater")) { throw new RuntimeException("Expecting to run this from the org.eclipse.epp.releng.updater project"); } var root = currentWorkingDirectory.resolve("../../..").toRealPath(); - if (arguments.contains("-to-milestone-repository")) { + if (arguments.contains("-send-email")) { + new Updater(root).sendEmail(); + } else if (arguments.contains("-to-milestone-repository")) { new Updater(root).toMilestoneRepository(); } else if (arguments.contains("-to-staging-repository")) { new Updater(root).toStagingRepository(); @@ -320,6 +321,14 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th saveModifiedContents(); } + private void sendEmail() throws IOException { + var text = getContents("https://download.eclipse.org/technology/epp/downloads/release/" + SIMREL_VERSION + "/" + + MILESTONE + "/_email.txt"); + text = text.replace("https://github.com/eclipse-packaging/packages/labels/endgame", getEndgameIssue()); + openURL("mailto:simrel-dev@eclipse.org?subject=" + encode("EPP " + SIMREL_VERSION + " " + MILESTONE) + "&body=" + + encode(text)); + } + private void toMilestoneRepository() throws IOException { var parentPOM = root.resolve("releng/org.eclipse.epp.config/parent/pom.xml"); var releaseFolderContent = getContents("https://download.eclipse.org/justj/?file=releases/" + SIMREL_VERSION); @@ -352,7 +361,7 @@ private void toMilestoneRepository() throws IOException { private void toStagingRepository() throws IOException { var parentPOM = root.resolve("releng/org.eclipse.epp.config/parent/pom.xml"); - String stagingRepository = "https://download.eclipse.org/staging/" + SIMREL_VERSION + "/"; + var stagingRepository = "https://download.eclipse.org/staging/" + SIMREL_VERSION + "/"; apply(parentPOM, "([^<]+)", stagingRepository); saveModifiedContents(); @@ -377,13 +386,13 @@ private String getEndgameIssue() throws IOException { return issueMatcher.group(1); } - private String getContents(String urix) throws IOException { + private String getContents(String location) throws IOException { try { - var uri = URI.create(urix); + var uri = URI.create(location); var httpClient = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.NORMAL).build(); var requestBuilder = HttpRequest.newBuilder(uri).GET(); var request = requestBuilder.build(); - HttpResponse response = httpClient.send(request, BodyHandlers.ofString()); + var response = httpClient.send(request, BodyHandlers.ofString()); var statusCode = response.statusCode(); if (statusCode != 200) { throw new IOException("status code " + statusCode + " -> " + uri); @@ -401,7 +410,7 @@ private void saveModifiedContents() throws IOException { } private static String encode(String value) { - return URLEncoder.encode(value, StandardCharsets.UTF_8); + return URLEncoder.encode(value, StandardCharsets.UTF_8).replace("+", "%20"); } private static void openURL(String uri) throws IOException { diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml index 3300b298..93765442 100644 --- a/releng/org.eclipse.epp.config/parent/pom.xml +++ b/releng/org.eclipse.epp.config/parent/pom.xml @@ -35,13 +35,13 @@ 2025-12 2026-06 - M2 + M3 4.39.0 - 202601291000 + 202602191000 - https://download.eclipse.org/releases/2026-03/202601301000/ + https://download.eclipse.org/staging/2026-03/ ${RELEASE_NAME}-${RELEASE_MILESTONE} diff --git a/releng/org.eclipse.epp.config/tools/prepareStagingSanityCheck b/releng/org.eclipse.epp.config/tools/prepareStagingSanityCheck new file mode 100644 index 00000000..db8c6c8b --- /dev/null +++ b/releng/org.eclipse.epp.config/tools/prepareStagingSanityCheck @@ -0,0 +1,93 @@ +#!/bin/bash -ex + +# This script is expect to run in the working directory the root of the git repository. + +STAGING_PRODUCT=$1 +UPDATE_PRODUCT=$2 +OS=$3 +WS=$4 +ARCH=$5 + +# You can test another OS manually by changing this. +# OS=linux +# WS=gtk + +# Operate on different file extensions and different way of extract that content depend on the OS. +# +if [[ $OS == 'win32' ]]; then +SUFFIX="zip" +UNPACK="unzip -q" +else +SUFFIX="tar.gz" +UNPACK="tar -xvf" +fi + +# Extract these values from the parent POM. +# +SIMREL_VERSION=$(sed -nE '1,$s%.*(.*).*%\1%p' releng/org.eclipse.epp.config/parent/pom.xml) +SIMREL_PREVIOUS_VERSION=$(sed -nE '1,$s%.*(.*).*%\1%p' releng/org.eclipse.epp.config/parent/pom.xml) +MILESTONE=$(sed -nE '1,$s%.*(.*).*%\1%p' releng/org.eclipse.epp.config/parent/pom.xml) + +# Show what we're operating upon. +# +echo "STAGING_PRODUCT=$STAGING_PRODUCT, UPDATE_PRODUCT=$UPDATE_PRODUCT, SIMREL_VERSION=$SIMREL_VERSION, MILESTONE=$MILESTONE, OS=$OS, WS=$WS, ARCH=$ARCH, SUFFIX=$SUFFIX, UNPACK='$UNPACK'" + +# Clean up the entire folder in which we extract content. +# + +rm -rf sanity-check + +################################################################## +# The staging product to test +################################################################## + +# The names are a bit inconsistent for Windows presumably because there is on one windowing system. +# +STAGING_PRODUCT_NAME=$(echo "eclipse-$STAGING_PRODUCT-$SIMREL_VERSION-$MILESTONE-$OS-$WS-$ARCH.$SUFFIX" | sed 's/win32-win32-/win32-/') + +mkdir -p sanity-check/staging-$STAGING_PRODUCT +cd sanity-check/staging-$STAGING_PRODUCT +curl -O "https://download.eclipse.org/technology/epp/staging/$STAGING_PRODUCT_NAME" +$UNPACK $STAGING_PRODUCT_NAME + +cd - + +################################################################## +# Update product from previous version to test for updating to current version +################################################################## + +# The names are a bit inconsistent for Windows presumably because there is on one windowing system. +# +UPDATE_PRODUCT_NAME=$(echo "eclipse-$UPDATE_PRODUCT-$SIMREL_PREVIOUS_VERSION-R-$OS-$WS-$ARCH.$SUFFIX" | sed 's/win32-win32-/win32-/') + +mkdir -p sanity-check/update-$UPDATE_PRODUCT +cd sanity-check/update-$UPDATE_PRODUCT +curl -O "https://download.eclipse.org/technology/epp/downloads/release/$SIMREL_PREVIOUS_VERSION/R/$UPDATE_PRODUCT_NAME" +$UNPACK $UPDATE_PRODUCT_NAME + +# Set the repository preferences for updating the old release to the current staging repositories. +# +for i in $(find eclipse -name "org.eclipse.equinox.p2.*.repository.prefs"); do +echo "Update preferences: $i" +cat >> $i << EOF + +repositories/https\:__download.eclipse.org_justj_epp_milestone_latest/enabled=true +repositories/https\:__download.eclipse.org_justj_epp_milestone_latest/isSystem=false +repositories/https\:__download.eclipse.org_justj_epp_milestone_latest/nickname=JustJ EPP Milestone Latest +repositories/https\:__download.eclipse.org_justj_epp_milestone_latest/uri=https\://download.eclipse.org/justj/epp/milestone/latest/ + +repositories/https\:__download.eclipse.org_staging_$SIMREL_VERSION/enabled=true +repositories/https\:__download.eclipse.org_staging_$SIMREL_VERSION/isSystem=false +repositories/https\:__download.eclipse.org_staging_$SIMREL_VERSION/nickname=SimRel Staging $SIMREL_VERSION +repositories/https\:__download.eclipse.org_staging_$SIMREL_VERSION/uri=https\://download.eclipse.org/staging/$SIMREL_VERSION/ + +repositories/https\:__download.eclipse.org_technology_epp_staging_repository/enabled=true +repositories/https\:__download.eclipse.org_technology_epp_staging_repository/isSystem=false +repositories/https\:__download.eclipse.org_technology_epp_staging_repository/nickname=EPP Staging $SIMREL_VERSION +repositories/https\:__download.eclipse.org_technology_epp_staging_repository/uri=https\://download.eclipse.org/technology/epp/staging/repository/ + +EOF + +done + +cd - \ No newline at end of file diff --git a/releng/org.eclipse.epp.config/tools/setGitDate b/releng/org.eclipse.epp.config/tools/setGitDate index 83f12728..e1a8b3bf 100755 --- a/releng/org.eclipse.epp.config/tools/setGitDate +++ b/releng/org.eclipse.epp.config/tools/setGitDate @@ -1,14 +1,23 @@ #!/bin/bash +# This script is expect to run in the working directory the root of the git repository. + GIT_DATE=`date --utc --iso-8601=seconds --date='12:00 today'` echo "Setting GIT dates to ${GIT_DATE}" export GIT_AUTHOR_DATE="${GIT_DATE}" export GIT_COMMITTER_DATE="${GIT_DATE}" + +# Extract these values from the parent POM. +# +SIMREL_VERSION=$(sed -nE '1,$s%.*(.*).*%\1%p' releng/org.eclipse.epp.config/parent/pom.xml) +SIMREL_PREVIOUS_VERSION=$(sed -nE '1,$s%.*(.*).*%\1%p' releng/org.eclipse.epp.config/parent/pom.xml) +MILESTONE=$(sed -nE '1,$s%.*(.*).*%\1%p' releng/org.eclipse.epp.config/parent/pom.xml) + for II in `find . -name .forceQualifierUpdate`; do echo "${GIT_DATE}" >$II; git add $II; done -git commit -m"Set version qualifiers with setGitDate script" +git commit -m"Set version qualifiers for $SIMREL_VERSION $MILESTONE with setGitDate script" diff --git a/releng/org.eclipse.epp.config/tools/upload-to-staging.sh b/releng/org.eclipse.epp.config/tools/upload-to-staging.sh index 4501a986..1ce04533 100755 --- a/releng/org.eclipse.epp.config/tools/upload-to-staging.sh +++ b/releng/org.eclipse.epp.config/tools/upload-to-staging.sh @@ -63,7 +63,7 @@ dsl - 2025-12 RC2 embedcpp - 2026-03 M1 java - 2025-06 RC1 jee - 2025-12 RC1 -modeling - 2026-03 M1 +modeling - 2026-03 M2 php - 2025-12 RC1 rcp - 2025-06 RC2 scout - 2026-03 M1 @@ -72,7 +72,7 @@ Platforms: Linux x86_64 - 2025-12 M3 Linux aarch64 - 2023-09 RC2 Linux riscv64 - 2025-12 M1 -Windows x86_64 - 2026-03 M1 +Windows x86_64 - 2026-03 M2 Windows on Arm - 2025-12 RC1 macOS x86_64 - 2026-03 M1 macOS aarch64 - 2025-12 RC1