Skip to content

Commit

Permalink
Merge branch 'eclipse-platform:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
jarthana authored Mar 13, 2024
2 parents c1b23cb + 7984dee commit 1a6a836
Show file tree
Hide file tree
Showing 249 changed files with 2,433 additions and 1,676 deletions.
11 changes: 0 additions & 11 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
version: 2
updates:
- package-ecosystem: maven
directory: eclipse-platform-parent
schedule:
interval: daily
commit-message:
prefix: fix
prefix-development: chore
include: scope
labels:
- dependencies
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily


- package-ecosystem: docker
directory: /cje-production/dockerfiles/centos-gtk3-metacity/8-gtk3
schedule:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeQLworkflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
description: 'The version of Maven set up'
type: string
required: false
default: '3.9.2'
default: '3.9.6'

jobs:
analyze:
Expand Down Expand Up @@ -54,12 +54,12 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

- name: Set up Java
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
with:
java-version: |
8
Expand Down Expand Up @@ -88,6 +88,6 @@ jobs:
${{ inputs.maven-goals }}
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
10 changes: 5 additions & 5 deletions .github/workflows/mavenBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
description: 'The version of Maven set up'
type: string
required: false
default: '3.9.2'
default: '3.9.6'

permissions: {}

Expand All @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Upload
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: Event File
path: ${{ github.event_path }}
Expand All @@ -50,7 +50,7 @@ jobs:
fetch-depth: 0 # required for jgit timestamp provider to work
submodules: ${{ inputs.submodules }}
- name: Set up Java
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
with:
java-version: |
8
Expand All @@ -67,7 +67,7 @@ jobs:
with:
maven-version: ${{ inputs.mavenVersion }}
- name: Download the API Tools matcher
uses: suisei-cn/actions-download-file@15306412d2c75df56b46844362b86b65235b7db1 # v1.4.0
uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # v1.6.0
id: api-tools-matcher
with:
url: "https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/.github/matcher/api-tools.json"
Expand All @@ -86,7 +86,7 @@ jobs:
${{ inputs.maven-goals }}
- name: Upload Test Results for ${{ matrix.config.name }}
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: test-results-${{ matrix.config.os }}
if-no-files-found: warn
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/prepareRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Maven
uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
with:
maven-version: 3.9.2
maven-version: 3.9.6
- id: get-release-name
run: |
name=$(echo ${{ github.event.milestone.due_on }} | cut -d- -f-2)
Expand All @@ -26,17 +26,17 @@ jobs:
with:
ref: master
- name: Set up JDK
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
with:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Update Main Versions
run: mvn -U -ntp -f eclipse-platform-parent org.eclipse.tycho:tycho-versions-plugin:4.0.2:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT -Dmodules=../eclipse.platform.releng.prereqs.sdk
run: mvn -U -ntp -f eclipse-platform-parent org.eclipse.tycho:tycho-versions-plugin:4.0.6:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT -Dmodules=../eclipse.platform.releng.prereqs.sdk
- name: Update Release Versions
run: mvn -ntp -f eclipse-platform-parent/pom.xml --non-recursive org.eclipse.tycho:tycho-versions-plugin:4.0.2:set-property -Dproperties=releaseNumberSDK,releaseNumberPlatform,releaseName -DnewReleaseName=${{ steps.get-release-name.outputs.name }} -DnewReleaseNumberSDK=${{ github.event.milestone.title }} -DnewReleaseNumberPlatform=${{ github.event.milestone.title }}
run: mvn -ntp -f eclipse-platform-parent/pom.xml --non-recursive org.eclipse.tycho:tycho-versions-plugin:4.0.6:set-property -Dproperties=releaseNumberSDK,releaseNumberPlatform,releaseName -DnewReleaseName=${{ steps.get-release-name.outputs.name }} -DnewReleaseNumberSDK=${{ github.event.milestone.title }} -DnewReleaseNumberPlatform=${{ github.event.milestone.title }}
- name: Create Pull Request for Release ${{ github.event.milestone.title }}
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc # v6.0.1
with:
commit-message: Prepare Release ${{ github.event.milestone.title }}
branch: prepare_R${{ github.event.milestone.title }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publishTestResults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
done
- name: Publish Test Results
uses: EnricoMi/publish-unit-test-result-action@ca89ad036b5fcd524c1017287fb01b5139908408 # v2.11.0
uses: EnricoMi/publish-unit-test-result-action@f355d34d53ad4e7f506f699478db2dd71da9de5f # v2.15.1
id: test-results
with:
commit: ${{ github.event.workflow_run.head_sha }}
Expand All @@ -72,7 +72,7 @@ jobs:
- name: Create badge
if: github.ref == 'refs/heads/master' && inputs.gist-url != ''
uses: emibcn/badge-action@4209421db54c8764d8932070ffd0f81715a629bf
uses: emibcn/badge-action@808173dd03e2f30c980d03ee49e181626088eee8
with:
label: Tests
status: '${{ fromJSON( steps.test-results.outputs.json ).formatted.stats.tests_succ }} passed, ${{ fromJSON( steps.test-results.outputs.json ).formatted.stats.tests_fail }} failed'
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/updateRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ jobs:
- name: Set up Maven
uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
with:
maven-version: 3.9.1
maven-version: 3.9.6
- name: Set up JDK
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
with:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Update Versions
run: >-
mvn -U -Pbuild-individual-bundles -ntp
org.eclipse.tycho:tycho-versions-plugin:4.0.4:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
org.eclipse.tycho:tycho-versions-plugin:4.0.4:set-parent-version -DnewParentVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
org.eclipse.tycho:tycho-versions-plugin:4.0.6:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
org.eclipse.tycho:tycho-versions-plugin:4.0.6:set-parent-version -DnewParentVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
- name: Build and Bump Versions
uses: Wandalen/wretry.action@a163f62ae554a8f3cbe27b23db15b60c0ae2e93c # master
uses: Wandalen/wretry.action@62e10cbe5cd3012bc08b3b1b451bc2dd612e341a # master
with:
attempt_delay: 120000
attempt_limit: 10
Expand All @@ -36,9 +36,9 @@ jobs:
clean verify
-DskipTests
-Dcompare-version-with-baselines.skip=false
org.eclipse.tycho:tycho-versions-plugin:4.0.4:bump-versions -Dtycho.bump-versions.increment=100
org.eclipse.tycho:tycho-versions-plugin:4.0.6:bump-versions -Dtycho.bump-versions.increment=100
- name: Create Pull Request for Release ${{ github.event.milestone.title }}
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc # v6.0.1
with:
commit-message: Update for release ${{ github.event.milestone.title }}
branch: update_R${{ github.event.milestone.title }}
Expand Down
7 changes: 2 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,14 @@
path = eclipse.jdt.ui
url = https://github.com/eclipse-jdt/eclipse.jdt.ui.git
[submodule "eclipse.pde"]
path = eclipse.pde
url = https://github.com/eclipse-pde/eclipse.pde.git
path = eclipse.pde
url = https://github.com/eclipse-pde/eclipse.pde.git
[submodule "eclipse.platform"]
path = eclipse.platform
url = https://github.com/eclipse-platform/eclipse.platform.git
[submodule "eclipse.platform.swt"]
path = eclipse.platform.swt
url = https://github.com/eclipse-platform/eclipse.platform.swt.git
[submodule "eclipse.platform.swt.binaries"]
path = eclipse.platform.swt.binaries
url = https://github.com/eclipse-platform/eclipse.platform.swt.binaries.git
[submodule "eclipse.platform.ui"]
path = eclipse.platform.ui
url = https://github.com/eclipse-platform/eclipse.platform.ui.git
Expand Down
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>4.0.4</version>
<version>4.0.6</version>
</extension>
</extensions>
2 changes: 2 additions & 0 deletions .mvn/jvm.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-XX:+PrintFlagsFinal
-XX:MaxRAMPercentage=35
35 changes: 9 additions & 26 deletions JenkinsJobs/Builds/I_build.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -147,21 +147,20 @@ spec:
"""
}
}
tools {
jdk 'openjdk-jdk17-latest'
}
environment {
MAVEN_OPTS = "-Xmx6G"
CJE_ROOT = "${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production"
PATH = "$PATH:/opt/tools/apache-maven/latest/bin"
logDir = "$CJE_ROOT/buildlogs"
}
stages {
stage('Clean Workspace'){
steps {
container('jnlp') {
sh \'\'\'
cd $WORKSPACE
rm -rf *
\'\'\'
cleanWs()
}
}
}
Expand All @@ -183,7 +182,7 @@ spec:
}
}
}
stage('Genrerate environment variables'){
stage('Generate environment variables'){
steps {
container('jnlp') {
sh \'\'\'
Expand Down Expand Up @@ -234,8 +233,7 @@ spec:
steps {
container('jnlp') {
sshagent(['projects-storage.eclipse.org-bot-ssh']) {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk17-latest') {
withAnt(installation: 'apache-ant-latest') {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
./mb020_createBaseBuilder.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb020_createBaseBuilder.sh.log
Expand All @@ -246,7 +244,6 @@ spec:
fi
\'\'\'
}
}
}
}
}
Expand Down Expand Up @@ -274,7 +271,7 @@ spec:
container('jnlp') {
sshagent(['git.eclipse.org-bot-ssh', 'github-bot-ssh']) {
sh \'\'\'
git config --global user.email "[email protected]"
git config --global user.email "eclipse-[email protected]"
git config --global user.name "Eclipse Releng Bot"
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
./mb100_cloneRepos.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb100_cloneRepos.sh.log
Expand All @@ -293,8 +290,6 @@ spec:
container('jnlp') {
sshagent (['git.eclipse.org-bot-ssh', 'github-bot-ssh', 'projects-storage.eclipse.org-bot-ssh']) {
sh \'\'\'
git config --global user.email "[email protected]"
git config --global user.name "Eclipse Releng Bot"
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
bash -x ./mb110_tagBuildInputs.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb110_tagBuildInputs.sh.log
if [[ ${PIPESTATUS[0]} -ne 0 ]]
Expand All @@ -310,7 +305,6 @@ spec:
stage('Create Source Bundles'){
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
unset JAVA_TOOL_OPTIONS
Expand All @@ -322,7 +316,6 @@ spec:
exit 1
fi
\'\'\'
}
}
}
}
Expand All @@ -333,7 +326,6 @@ spec:
}
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
unset JAVA_TOOL_OPTIONS
Expand All @@ -345,7 +337,6 @@ spec:
exit 1
fi
\'\'\'
}
}
}
}
Expand All @@ -356,8 +347,7 @@ spec:
}
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk17-latest') {
withAnt(installation: 'apache-ant-latest') {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
bash -x ./mb300_gatherEclipseParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb300_gatherEclipseParts.sh.log
Expand All @@ -368,7 +358,6 @@ spec:
fi
\'\'\'
}
}
}
}
}
Expand All @@ -379,8 +368,7 @@ spec:
}
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk17-latest') {
withAnt(installation: 'apache-ant-latest') {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
./mb310_gatherEquinoxParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb310_gatherEquinoxParts.sh.log
Expand All @@ -391,14 +379,12 @@ spec:
fi
\'\'\'
}
}
}
}
}
stage('Generate Repo reports'){
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
unset JAVA_TOOL_OPTIONS
Expand All @@ -410,14 +396,12 @@ spec:
exit 1
fi
\'\'\'
}
}
}
}
stage('Generate API tools reports'){
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
unset JAVA_TOOL_OPTIONS
Expand All @@ -429,7 +413,6 @@ spec:
exit 1
fi
\'\'\'
}
}
}
}
Expand Down
Loading

0 comments on commit 1a6a836

Please sign in to comment.