Skip to content

Commit

Permalink
[Build] Unify references to I-Build composite repository
Browse files Browse the repository at this point in the history
  • Loading branch information
HannesWell committed Jan 31, 2025
1 parent 64d8b3a commit 3f326cf
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
3 changes: 1 addition & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ The release is scheduled for 10AM EST. Typically the jobs are scheduled beforeha
- Once the I-build repo is removed for the previous release the maintenance branch will have to use the release location, i.e. any references to `https://download.eclipse.org/eclipse/updates/4.25-I-builds/` will need to be updated to `https://download.eclipse.org/eclipse/updates/4.26/R-4.26-202211231800/`
- Functionally this means:
- Update the ECLIPSE_RUN_REPO in the [cje-production](cje-production) buildproperties.txt files
- Update eclipserun-repo, comparator.repo and eclipse-p2-repo.url in [eclipse-platform-parent/pom.xml](eclipse-platform-parent/pom.xml)
- Update `eclipse-sdk-repo` in [eclipse-platform-parent/pom.xml](eclipse-platform-parent/pom.xml)
- This step can be prepared ahead of time but can't be merged until the release build has been promoted and the update site exists.
* **Update ECJ compiler** in the platform build (if it needs to be updated).
* To find the new *unqualified* compiler version:
Expand Down Expand Up @@ -202,7 +202,6 @@ The release is scheduled for 10AM EST. Typically the jobs are scheduled beforeha
- In [eclipse-equinox/equinox](https://github.com/eclipse-equinox/equinox) update the versions in the Info.plist for both architectures under `eclipse-equinox/equinox/features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx`
- **Update comparator repo and eclipse run repo**
- Update the ECLIPSE_RUN_REPO in the [cje-production](cje-production) buildproperties.txt files
- Update eclipserun-repo, comparator.repo and eclipse-p2-repo.url in [eclipse-platform-parent/pom.xml](eclipse-platform-parent/pom.xml)
- **Set Previous Version to RC2**
- RC2 becomes the new baseline for the week before the GA release.
- Update previous-release.baseline in [eclipse-platform-parent/pom.xml](eclipse-platform-parent/pom.xml)
Expand Down
4 changes: 1 addition & 3 deletions cje-production/mbscripts/mb220_buildSdkPatch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ fi
source $CJE_ROOT/scripts/common-functions.shsource
source $1

if [[ -z "${WORKSPACE}" ]]
then
if [[ -z "${WORKSPACE}" ]]; then
MVN_ARGS=""
else
MVN_ARGS="-Pbree-libs -Peclipse-sign"
Expand All @@ -46,7 +45,6 @@ mvn clean verify -DskipTests=true ${MVN_ARGS} \
-DbuildTimestamp=$TIMESTAMP \
-DbuildType=$BUILD_TYPE \
-DbuildId=$BUILD_ID \
-Declipse-p2-repo.url=NOT_FOR_PRODUCTION_USE \
-Dcbi-ecj-version=99.99 \
-e \
-T 1C \
Expand Down
10 changes: 6 additions & 4 deletions eclipse-platform-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,16 @@
<cbi-plugins.version>1.5.1</cbi-plugins.version>
<surefire.version>3.5.2</surefire.version>

<eclipse-sdk-repo>https://download.eclipse.org/eclipse/updates/${releaseVersion}-I-builds</eclipse-sdk-repo>

<!--
The tycho-eclipserun-plugin will create its instance of Eclipse from this
'eclipiserun-repo' repository, such as for computing .api-descriptions and
generating API Tools reports.
-->
<eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.35-I-builds/</eclipserun-repo>
<eclipserun-repo>${eclipse-sdk-repo}</eclipserun-repo>

<comparator.repo>https://download.eclipse.org/eclipse/updates/4.35-I-builds</comparator.repo>
<comparator.repo>${eclipse-sdk-repo}</comparator.repo>

<!-- only used when Tycho snapshot repo is enabled in <pluginRepositories> further down -->
<tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url>
Expand Down Expand Up @@ -806,7 +808,7 @@
For maintenance streams should always be "M-builds".
Ideally, this value would be provided by the environment, see bug 489789.
-->
<eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.35-I-builds</eclipse-p2-repo.url>
<eclipse-p2-repo.url>${eclipse-sdk-repo}</eclipse-p2-repo.url>
</properties>
<repositories>
<repository>
Expand Down Expand Up @@ -941,7 +943,7 @@
</repository>
</baselines>
<apiToolsRepository>
<url>https://download.eclipse.org/eclipse/updates/4.35-I-builds/</url>>
<url>${eclipse-sdk-repo}</url>>
</apiToolsRepository>
<skip>${skipAPIAnalysis}</skip>
<skipIfReplaced>false</skipIfReplaced>
Expand Down

0 comments on commit 3f326cf

Please sign in to comment.