diff --git a/RELEASING.md b/RELEASING.md index d2086677..e8bd10f8 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -72,15 +72,7 @@ Scroll down for the per-milestone/RC steps. - [ ] Update `SIMREL_REPO` in `releng/org.eclipse.epp.config/parent/pom.xml` if not done above. - [ ] Or use the `Run` toolbar button drop-down menu to launch the `Update to Milestone Repository` launch configuration. This will automatically determine the correct update site URL and will create an appropriate commit message in the system clipboard. -- [ ] Update the build qualifiers to ensure that packages are all updated. - See this [gerrit](https://git.eclipse.org/r/#/c/161075/) for an example. - Commit all other changes before this step because this step will automatically create a Git commit specifically for the forced qualifier changes. - Use the `External Tools` toolbar drop-down menu to launch the `Update Qualifiers` launch configuration. - This runs the [setGitDate](releng/org.eclipse.epp.config/tools/setGitDate) bash script. - This script will make a local commit you need to push; **do not amend it** because the timestamp is relevant. - - In some cases a respin/rebuild is needed and setGitDate needs to be run again. - In that case you may need to manually add a minute or two to the applied timestamp in the script. -- [ ] Push the two commits on the new branch to your fork in order to launch a verification build and then merge the result to `main`. +- [ ] Push the commit on the new branch to your fork in order to launch a verification build and then merge the result to `main`. - [ ] Run a [CI build](https://ci.eclipse.org/packaging/job/epp/job/master/) that includes the above changes. - If the build fails there may be the opportunity to continue the build rather than restart it. This is relatively underused option but enabled by the multi-step Jenkins build in the Jenkinsfile. diff --git a/releng/org.eclipse.epp.config/oomph/EPP.setup b/releng/org.eclipse.epp.config/oomph/EPP.setup index 399ad8e5..aaa37b66 100644 --- a/releng/org.eclipse.epp.config/oomph/EPP.setup +++ b/releng/org.eclipse.epp.config/oomph/EPP.setup @@ -432,23 +432,6 @@ value="${bash.location}"> The location of the bash command that will execute bash on your operating system; it is used in the External Tools Configurations. - - - <?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> - <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 releng/org.eclipse.epp.config/tools/setGitDate"/> - <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="$${workspace_loc:/org.eclipse.epp.packages}"/> - </launchConfiguration> - - - diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml index 985c5d63..22aa1da8 100644 --- a/releng/org.eclipse.epp.config/parent/pom.xml +++ b/releng/org.eclipse.epp.config/parent/pom.xml @@ -176,11 +176,6 @@ org.eclipse.tycho tycho-packaging-plugin - - org.eclipse.tycho - tycho-buildtimestamp-jgit - ${tycho.version} - org.eclipse.tycho.extras tycho-sourceref-jgit @@ -188,8 +183,6 @@ - jgit - ignore yyyyMMdd-HHmm true diff --git a/releng/org.eclipse.epp.config/tools/setGitDate b/releng/org.eclipse.epp.config/tools/setGitDate deleted file mode 100755 index e1a8b3bf..00000000 --- a/releng/org.eclipse.epp.config/tools/setGitDate +++ /dev/null @@ -1,23 +0,0 @@ -#!/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 for $SIMREL_VERSION $MILESTONE with setGitDate script"