Skip to content

Commit

Permalink
Add new target platforms to CI pipeline and fix Oomph setup
Browse files Browse the repository at this point in the history
  • Loading branch information
@donat
donat committed Jan 6, 2022
1 parent 73a2583 commit 811f777
Show file tree
Hide file tree
Showing 8 changed files with 243 additions and 100 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ bin
*.iws

screenshots

tooling-latest.target
4 changes: 3 additions & 1 deletion .teamcity/Buildship/EclipseVersion.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ enum class EclipseVersion(val codeName: String, val versionNumber: String) {
ECLIPSE4_17("2020-09", "4.17"),
ECLIPSE4_18("2020-12", "4.18"),
ECLIPSE4_19("2021-03", "4.19"),
ECLIPSE4_20("2021-06", "4.20");
ECLIPSE4_20("2021-06", "4.20"),
ECLIPSE4_21("2021-09", "4.21"),
ECLIPSE4_22("2021-12", "4.22");

val updateSiteVersion: String
get() = versionNumber.replace(".", "")
Expand Down
10 changes: 6 additions & 4 deletions .teamcity/Buildship/Project.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.*

val individualBuildsForPhase1 = listOf(
IndividualScenarioBuildType(ScenarioType.SANITY_CHECK, OS.LINUX, EclipseVersion.ECLIPSE4_13, eclipseRuntimeJdk = Jdk.ORACLE_JDK_8)
IndividualScenarioBuildType(ScenarioType.SANITY_CHECK, OS.LINUX, EclipseVersion.ECLIPSE4_13, eclipseRuntimeJdk = Jdk.ORACLE_JDK_8) // TODO use latest Eclipse version for sanity check coverage
)
val individualBuildsForPhase2 = listOf(
IndividualScenarioBuildType(ScenarioType.BASIC_COVERAGE, OS.LINUX, EclipseVersion.ECLIPSE4_8, eclipseRuntimeJdk = Jdk.ORACLE_JDK_8),
IndividualScenarioBuildType(ScenarioType.BASIC_COVERAGE, OS.LINUX, EclipseVersion.ECLIPSE4_20, eclipseRuntimeJdk = Jdk.OPEN_JDK_11),
IndividualScenarioBuildType(ScenarioType.BASIC_COVERAGE, OS.WINDOWS, EclipseVersion.ECLIPSE4_8, eclipseRuntimeJdk = Jdk.ORACLE_JDK_8),
IndividualScenarioBuildType(ScenarioType.BASIC_COVERAGE, OS.WINDOWS, EclipseVersion.ECLIPSE4_20, eclipseRuntimeJdk = Jdk.OPEN_JDK_11)
IndividualScenarioBuildType(ScenarioType.BASIC_COVERAGE, OS.WINDOWS, EclipseVersion.ECLIPSE4_22, eclipseRuntimeJdk = Jdk.OPEN_JDK_11)
)
val individualBuildsForPhase3 = listOf(
IndividualScenarioBuildType(ScenarioType.FULL_COVERAGE, OS.LINUX, EclipseVersion.ECLIPSE4_8, eclipseRuntimeJdk = Jdk.ORACLE_JDK_8),
Expand All @@ -28,12 +28,14 @@ val individualBuildsForPhase3 = listOf(
IndividualScenarioBuildType(ScenarioType.FULL_COVERAGE, OS.LINUX, EclipseVersion.ECLIPSE4_18, eclipseRuntimeJdk = Jdk.OPEN_JDK_11),
IndividualScenarioBuildType(ScenarioType.FULL_COVERAGE, OS.LINUX, EclipseVersion.ECLIPSE4_19, eclipseRuntimeJdk = Jdk.OPEN_JDK_11),
IndividualScenarioBuildType(ScenarioType.FULL_COVERAGE, OS.LINUX, EclipseVersion.ECLIPSE4_20, eclipseRuntimeJdk = Jdk.OPEN_JDK_11),
IndividualScenarioBuildType(ScenarioType.FULL_COVERAGE, OS.LINUX, EclipseVersion.ECLIPSE4_21, eclipseRuntimeJdk = Jdk.OPEN_JDK_11),
IndividualScenarioBuildType(ScenarioType.FULL_COVERAGE, OS.LINUX, EclipseVersion.ECLIPSE4_22, eclipseRuntimeJdk = Jdk.OPEN_JDK_11),

IndividualScenarioBuildType(ScenarioType.FULL_COVERAGE, OS.WINDOWS, EclipseVersion.ECLIPSE4_8, eclipseRuntimeJdk = Jdk.ORACLE_JDK_8),
IndividualScenarioBuildType(ScenarioType.FULL_COVERAGE, OS.WINDOWS, EclipseVersion.ECLIPSE4_20, eclipseRuntimeJdk = Jdk.OPEN_JDK_11)
IndividualScenarioBuildType(ScenarioType.FULL_COVERAGE, OS.WINDOWS, EclipseVersion.ECLIPSE4_22, eclipseRuntimeJdk = Jdk.OPEN_JDK_11)
)
val individualBuildsForPhase4 = listOf(
IndividualScenarioBuildType(ScenarioType.CROSS_VERSION, OS.LINUX, EclipseVersion.ECLIPSE4_8, eclipseRuntimeJdk = Jdk.ORACLE_JDK_8)
IndividualScenarioBuildType(ScenarioType.CROSS_VERSION, OS.LINUX, EclipseVersion.ECLIPSE4_8, eclipseRuntimeJdk = Jdk.ORACLE_JDK_8) // TODO use latest Eclipse version for cross-version coverage
)

val tb1_1 = CheckpointBuildType("Sanity Check (Phase 1/1)", individualBuildsForPhase1, null)
Expand Down
3 changes: 2 additions & 1 deletion Launch Buildship.launch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="true"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<stringAttribute key="checked" value="org.eclipse.buildship.core"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="false"/>
<booleanAttribute key="clearwslog" value="false"/>
Expand All @@ -17,6 +17,7 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<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_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
Expand Down
88 changes: 87 additions & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def eclipseVersionAgnosticDependencies = [
// the default version is 48 which can be overridden through -Peclipse.version=<version>
// also the target platforms contain 1) the Eclipse SDK 2) the latest junit 3) SWTBot 2.2.1
eclipseBuild {
defaultEclipseVersion = '420'
defaultEclipseVersion = '422'

final def swtPluginId = "org.eclipse.swt.${ECLIPSE_WS}.${ECLIPSE_OS}.${ECLIPSE_ARCH}"

Expand Down Expand Up @@ -731,6 +731,92 @@ eclipseBuild {
]
}

targetPlatform {
eclipseVersion = '421'
targetDefinition = file('tooling-e421.target')
versionMapping = [
"$swtPluginId" : '3.117.0',
'com.ibm.icu' : '67.1.0',
'org.eclipse.core.expressions' : '3.8.0',
'org.eclipse.core.filesystem' : '1.9.100',
'org.eclipse.core.net' : '1.3.1100',
'org.eclipse.core.resources' : '3.15.100',
'org.eclipse.core.runtime' : '3.23.0',
'org.eclipse.core.variables' : '3.5.100',
'org.eclipse.debug.core' : '3.18.200',
'org.eclipse.debug.ui' : '3.15.100',
'org.eclipse.help' : '3.9.100',
'org.eclipse.jdt.core' : '3.27.0',
'org.eclipse.jdt.junit.core' : '3.11.0',
'org.eclipse.jdt.launching' : '3.19.300',
'org.eclipse.jdt.ui' : '3.24.0',
'org.eclipse.jface.databinding' : '1.13.0',
'org.eclipse.jface.text' : '3.18.100',
'org.eclipse.ui' : '3.119.100',
'org.eclipse.ui.console' : '3.11.100',
'org.eclipse.ui.editors' : '3.14.200',
'org.eclipse.ui.ide' : '3.18.300',
'org.eclipse.ui.navigator' : '3.10.100',
'org.eclipse.ui.views' : '3.11.100',
'org.eclipse.ui.workbench.texteditor' : '3.16.200',
'org.junit' : '4.13.0',
'org.eclipse.emf.ecore' : '2.25.0',
'org.eclipse.emf.edit' : '2.16.0',
'org.eclipse.oomph.resources' : '1.15.0',
'org.eclipse.oomph.resources.edit' : '1.11.0',
'org.eclipse.oomph.predicates' : '1.12.0',
'org.eclipse.oomph.predicates.edit' : '1.11.0',
'org.eclipse.oomph.setup' : '1.21.0',
'org.eclipse.oomph.setup.core' : '1.21.0',
'org.eclipse.oomph.setup.edit' : '1.15.0',
'org.eclipse.oomph.base' : '1.14.0',
'org.eclipse.oomph.base.edit' : '1.13.0'
]
}

targetPlatform {
eclipseVersion = '422'
targetDefinition = file('tooling-e422.target')
versionMapping = [
"$swtPluginId" : '3.118.0',
'com.ibm.icu' : '67.1.0',
'org.eclipse.core.expressions' : '3.8.100',
'org.eclipse.core.filesystem' : '1.9.200',
'org.eclipse.core.net' : '1.3.1100',
'org.eclipse.core.resources' : '3.16.0',
'org.eclipse.core.runtime' : '3.24.0',
'org.eclipse.core.variables' : '3.5.100',
'org.eclipse.debug.core' : '3.18.300',
'org.eclipse.debug.ui' : '3.15.200',
'org.eclipse.help' : '3.9.100',
'org.eclipse.jdt.core' : '3.28.0',
'org.eclipse.jdt.junit.core' : '3.11.100',
'org.eclipse.jdt.launching' : '3.19.400',
'org.eclipse.jdt.ui' : '3.25.0',
'org.eclipse.jface.databinding' : '1.13.0',
'org.eclipse.jface.text' : '3.19.0',
'org.eclipse.ui' : '3.200.0',
'org.eclipse.ui.console' : '3.11.100',
'org.eclipse.ui.editors' : '3.14.300',
'org.eclipse.ui.ide' : '3.18.400',
'org.eclipse.ui.navigator' : '3.10.200',
'org.eclipse.ui.views' : '3.11.100',
'org.eclipse.ui.workbench.texteditor' : '3.16.300',
'org.junit' : '4.13.2',
'org.eclipse.emf.ecore' : '2.25.0',
'org.eclipse.emf.edit' : '2.16.0',
'org.eclipse.oomph.resources' : '1.15.0',
'org.eclipse.oomph.resources.edit' : '1.11.0',
'org.eclipse.oomph.predicates' : '1.13.0',
'org.eclipse.oomph.predicates.edit' : '1.11.0',
'org.eclipse.oomph.setup' : '1.22.0',
'org.eclipse.oomph.setup.core' : '1.22.0',
'org.eclipse.oomph.setup.edit' : '1.15.0',
'org.eclipse.oomph.base' : '1.15.0',
'org.eclipse.oomph.base.edit' : '1.13.0'
]
}

scmRepo = "https://github.com/eclipse/buildship.git"
commitId = currentCommitId()
}
Expand Down
Loading

0 comments on commit 811f777

Please sign in to comment.