Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: add tests for latest release of Eclipse #3661

Draft
wants to merge 23 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
174567b
test: fix breakages in tests found during update to Tycho 2.5.0
briandealwis Feb 2, 2022
3ae8800
chore: http -> https for download.eclipse.org
briandealwis Dec 15, 2021
586ef1e
try with maven 3.8.4
briandealwis Dec 15, 2021
14be20a
show stacktrace on build error
briandealwis Dec 15, 2021
4fdc1b1
chore: update to Tycho 2.5.0
briandealwis Dec 15, 2021
1c9603d
add useJDK for tycho-surefire
briandealwis Dec 15, 2021
0e35fd7
tycho 2.5.0 requires Java 11+ so must use BREE for Java 8
briandealwis Dec 16, 2021
07ac6a8
remove unneeded `mvn -e`
briandealwis Feb 2, 2022
f937836
ci: add tests for latest release of Eclipse
briandealwis Dec 14, 2021
7568506
Eclipse latest uses Java 17
briandealwis Feb 2, 2022
3339b0f
chore: http -> https for download.eclipse.org
briandealwis Dec 15, 2021
d3de300
try with maven 3.8.4
briandealwis Dec 15, 2021
cb6b5ce
show stacktrace on build error
briandealwis Dec 15, 2021
ab74eba
chore: update to Tycho 2.5.0
briandealwis Dec 15, 2021
be7797d
add useJDK for tycho-surefire
briandealwis Dec 15, 2021
67f83ef
tycho 2.5.0 requires Java 11+ so must use BREE for Java 8
briandealwis Dec 16, 2021
fb60b79
remove unneeded `mvn -e`
briandealwis Feb 2, 2022
d92903b
kokoro: install Java 11, and configure toolchains
briandealwis Mar 14, 2022
3a8f6ee
fix yaml indentation
briandealwis Mar 15, 2022
94d4728
with tycho 2.5.0, we must use toolchains
briandealwis Mar 15, 2022
be3cca1
install Java 17 as is required for Eclipse 2021 releases
briandealwis Mar 16, 2022
a00db47
Merge remote-tracking branch 'origin/tycho-2.5.0' into HEAD
briandealwis Mar 16, 2022
1951eef
back out javax.inject change
briandealwis Mar 16, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/workflows/eclipse-2018-09-java8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,19 @@ jobs:
steps:
- uses: actions/checkout@v2

# Java 8 required for compilation, but Java 11 required by Tycho 2.5+
- uses: actions/setup-java@v1
with:
java-version: 8
- name: Set JDK 8 toolchain
run: |
sed -i.bak -e "s,JDK_8_HOME,${JAVA_HOME}," .github/workflows/toolchains.xml
- uses: actions/setup-java@v1
with:
java-version: 11
- name: Set JDK 11 toolchain
run: |
sed -i.bak -e "s,JDK_11_HOME,${JAVA_HOME}," .github/workflows/toolchains.xml

- uses: google-github-actions/[email protected]

Expand All @@ -47,6 +57,9 @@ jobs:
export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
gcloud components install app-engine-java --quiet

# 2018-09 was the last release to work on Java 8
xvfb-run mvn --show-version --batch-mode --fail-at-end \
--toolchains=.github/workflows/toolchains.xml \
-Dtycho.toolchains=BREE -Dtycho.testToolchains=BREE \
-Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
clean verify
66 changes: 66 additions & 0 deletions .github/workflows/eclipse-latest-java17.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Eclipse latest release on Java 11
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
workflow_dispatch: # Allows you to run this workflow manually from the Actions tab

jobs:
tests:
runs-on: ubuntu-latest
strategy:
fail-fast: false
env:
CLOUDSDK_CORE_DISABLE_USAGE_REPORTING: true

steps:
- uses: actions/checkout@v2

- uses: actions/setup-java@v1
with:
java-version: 8 # Java 8 required for compilation.
- name: Set JDK 8 toolchain
run: |
sed -i.bak -e "s,JDK_8_HOME,${JAVA_HOME}," .github/workflows/toolchains.xml

- uses: actions/setup-java@v1
with:
java-version: 17
- name: Set JDK 17 toolchain
run: |
sed -i.bak \
-e "s,JDK_11_HOME,${JAVA_HOME}," \
-e "s,<id>JavaSE-11</id>,<id>JavaSE-17</id>," \
-e "s,<version>11</version>,<version>17</version>," \
.github/workflows/toolchains.xml

- uses: google-github-actions/[email protected]

- uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-${{ env.ECLIPSE_TARGET }}

- name: Run tests
env:
MAVEN_OPTS: '-Xmx700m -Dorg.slf4j.simpleLogger.showDateTime=true'
run: |
# google-github-actions/[email protected] sets up gcloud at, e.g,.
# "/opt/hostedtoolcache/gcloud/325.0.0/x64". appengine-plugins-core
# fails to find it, since the directory doesn't end with
# "google-cloud-sdk". Instead, appengine-plugins-core picks up the SDK
# at "/usr/lib/google-cloud-sdk" managed by a package manager. As a
# workaround, create a symlink at $HOME and add it to $PATH.
ln -s "$( dirname "$( dirname "$( which gcloud )")")" \
"${HOME}"/google-cloud-sdk
ls -ld "${HOME}"/google-cloud-sdk
export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
gcloud components install app-engine-java --quiet

xvfb-run mvn --show-version --batch-mode --fail-at-end \
--toolchains=.github/workflows/toolchains.xml \
-Derrorprone -Dci-build \
clean verify
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ which resolves the specified dependencies and creates a `.target`.
The process is:

1. Install the TPD Editor, if necessary
- Use _Help > Install New Software_ and specify `http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/`
- Use _Help > Install New Software_ and specify `https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/`
as the location.
- Restart Eclipse when prompted
2. Open the `.tpd` file in Eclipse.
Expand Down
4 changes: 2 additions & 2 deletions eclipse/common-dependencies.tpd
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
target "Cloud Tools for Eclipse: Common Dependencies"

location "http://download.eclipse.org/tools/orbit/downloads/latest-R/" {
location "https://download.eclipse.org/tools/orbit/downloads/latest-R/" {
org.hamcrest.core [1.3.0,1.3.1)
org.hamcrest.integration [1.3.0,1.3.1)
org.hamcrest.library [1.3.0,1.3.1)
Expand All @@ -19,6 +19,6 @@ location "http://dadacoalition.org/yedit/" {
}

// SWTBot 2.8.0 supports Oxygen and later (https://wiki.eclipse.org/SWTBot#Latest_Release)
location "http://download.eclipse.org/technology/swtbot/releases/2.8.0/" {
location "https://download.eclipse.org/technology/swtbot/releases/2.8.0/" {
org.eclipse.swtbot.eclipse.feature.group
}
10 changes: 5 additions & 5 deletions eclipse/eclipse-2018-09/gcp-eclipse-2018-09.target
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/>
<unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/>
<unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/>
<repository location="http://download.eclipse.org/releases/2018-09/201809191002/"/>
<repository location="https://download.eclipse.org/releases/2018-09/201809191002/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.8.0.v201802202154"/>
Expand All @@ -27,11 +27,11 @@
<unit id="org.eclipse.wst.web_sdk.feature.feature.group" version="3.11.0.v201807251925"/>
<unit id="org.eclipse.jst.enterprise_sdk.feature.feature.group" version="3.8.1.v201802202154"/>
<unit id="org.eclipse.wst.server_adapters.sdk.feature.feature.group" version="3.2.601.v201802152148"/>
<repository location="http://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-20180910170749/repository"/>
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-20180910170749/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="4.0.1.201809121533"/>
<repository location="http://download.eclipse.org/linuxtools/update-2018-09-docker/"/>
<repository location="https://download.eclipse.org/linuxtools/update-2018-09-docker/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
Expand All @@ -42,15 +42,15 @@
<unit id="org.slf4j.apis.log4j" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.bridge.jul" version="1.7.30.v20200204-2150"/>
<unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.dadacoalition.yedit.feature.feature.group" version="1.0.20.201509041456-RELEASE"/>
<repository location="http://dadacoalition.org/yedit/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
<repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
<repository location="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
</location>
</locations>
</target>
12 changes: 6 additions & 6 deletions eclipse/eclipse-2018-09/gcp-eclipse-2018-09.tpd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Target Platform Definition created using Eclipse TPD editor
* (http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
* (https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
*
* If you make changes to this file, either:
*
Expand All @@ -13,8 +13,8 @@ target "GCP for Eclipse 2018-09" with source requirements
// Eclipse Platform 4.9
// Eclipse WTP 3.11

// Eclipse 2018-09 (composite at http://download.eclipse.org/releases/2018-09/)
location "http://download.eclipse.org/releases/2018-09/201809191002/" {
// Eclipse 2018-09 (composite at https://download.eclipse.org/releases/2018-09/)
location "https://download.eclipse.org/releases/2018-09/201809191002/" {
org.eclipse.sdk.feature.group
org.eclipse.jdt.feature.group
org.eclipse.m2e.feature.feature.group
Expand All @@ -33,8 +33,8 @@ location "http://download.eclipse.org/releases/2018-09/201809191002/" {
}

// WTP SDKs aren't exposed through the main release links
// (composite at http://download.eclipse.org/webtools/repository/2018-09)
location "http://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-20180910170749/repository" {
// (composite at https://download.eclipse.org/webtools/repository/2018-09)
location "https://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-20180910170749/repository" {
org.eclipse.jst.web_sdk.feature.feature.group
org.eclipse.jst.server_sdk.feature.feature.group
org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group
Expand All @@ -44,7 +44,7 @@ location "http://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-
org.eclipse.wst.server_adapters.sdk.feature.feature.group
}

location "http://download.eclipse.org/linuxtools/update-2018-09-docker/" {
location "https://download.eclipse.org/linuxtools/update-2018-09-docker/" {
org.eclipse.linuxtools.docker.feature.feature.group
}

Expand Down
10 changes: 5 additions & 5 deletions eclipse/eclipse-2018-12/gcp-eclipse-2018-12.target
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181113"/>
<unit id="org.eclipse.jetty.server" version="9.4.14.v20181113"/>
<unit id="org.eclipse.jetty.util" version="9.4.14.v20181113"/>
<repository location="http://download.eclipse.org/releases/2018-12/201812191000"/>
<repository location="https://download.eclipse.org/releases/2018-12/201812191000"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.8.0.v201802202154"/>
Expand All @@ -27,11 +27,11 @@
<unit id="org.eclipse.wst.web_sdk.feature.feature.group" version="3.11.0.v201807251925"/>
<unit id="org.eclipse.jst.enterprise_sdk.feature.feature.group" version="3.8.1.v201802202154"/>
<unit id="org.eclipse.wst.server_adapters.sdk.feature.feature.group" version="3.2.601.v201802152148"/>
<repository location="http://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repository"/>
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="4.1.0.201812121718"/>
<repository location="http://download.eclipse.org/linuxtools/update-2018-12-docker/"/>
<repository location="https://download.eclipse.org/linuxtools/update-2018-12-docker/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
Expand All @@ -42,15 +42,15 @@
<unit id="org.slf4j.apis.log4j" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.bridge.jul" version="1.7.30.v20200204-2150"/>
<unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.dadacoalition.yedit.feature.feature.group" version="1.0.20.201509041456-RELEASE"/>
<repository location="http://dadacoalition.org/yedit/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
<repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
<repository location="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
</location>
</locations>
</target>
12 changes: 6 additions & 6 deletions eclipse/eclipse-2018-12/gcp-eclipse-2018-12.tpd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Target Platform Definition created using Eclipse TPD editor
* (http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
* (https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
*
* If you make changes to this file, either:
*
Expand All @@ -13,8 +13,8 @@ target "GCP for Eclipse 2018-12" with source requirements
// Eclipse Platform 4.10
// Eclipse WTP 3.12

// Eclipse 2018-12 RC2 (composite at http://download.eclipse.org/releases/2018-12/)
location "http://download.eclipse.org/releases/2018-12/201812191000" {
// Eclipse 2018-12 RC2 (composite at https://download.eclipse.org/releases/2018-12/)
location "https://download.eclipse.org/releases/2018-12/201812191000" {
org.eclipse.sdk.feature.group
org.eclipse.jdt.feature.group
org.eclipse.m2e.feature.feature.group
Expand All @@ -33,8 +33,8 @@ location "http://download.eclipse.org/releases/2018-12/201812191000" {
}

// WTP SDKs aren't exposed through the main release links
// (composite at http://download.eclipse.org/webtools/repository/2018-12/)
location "http://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repository" {
// (composite at https://download.eclipse.org/webtools/repository/2018-12/)
location "https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repository" {
org.eclipse.jst.web_sdk.feature.feature.group
org.eclipse.jst.server_sdk.feature.feature.group
org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group
Expand All @@ -44,7 +44,7 @@ location "http://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-
org.eclipse.wst.server_adapters.sdk.feature.feature.group
}

location "http://download.eclipse.org/linuxtools/update-2018-12-docker/" {
location "https://download.eclipse.org/linuxtools/update-2018-12-docker/" {
org.eclipse.linuxtools.docker.feature.feature.group
}

Expand Down
8 changes: 4 additions & 4 deletions eclipse/eclipse-2019-09/gcp-eclipse-2019-09.target
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<unit id="org.eclipse.jetty.servlet" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.server" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util" version="9.4.20.v20190813"/>
<repository location="http://download.eclipse.org/releases/2019-09/"/>
<repository location="https://download.eclipse.org/releases/2019-09/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.15.0.v201908261515"/>
Expand All @@ -31,7 +31,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="4.4.0.201909110158"/>
<repository location="http://download.eclipse.org/linuxtools/update-2019-09-docker/"/>
<repository location="https://download.eclipse.org/linuxtools/update-2019-09-docker/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
Expand All @@ -42,15 +42,15 @@
<unit id="org.slf4j.apis.log4j" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.bridge.jul" version="1.7.30.v20200204-2150"/>
<unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.dadacoalition.yedit.feature.feature.group" version="1.0.20.201509041456-RELEASE"/>
<repository location="http://dadacoalition.org/yedit/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
<repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
<repository location="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
</location>
</locations>
</target>
10 changes: 5 additions & 5 deletions eclipse/eclipse-2019-09/gcp-eclipse-2019-09.tpd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Target Platform Definition created using Eclipse TPD editor
* (http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
* (https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
*
* If you make changes to this file, either:
*
Expand All @@ -13,8 +13,8 @@ target "GCP for Eclipse 2019-09" with source requirements
// Eclipse Platform 4.13
// Eclipse WTP 3.15

// Eclipse 2019-09 RC2 (composite at http://download.eclipse.org/releases/2019-09/)
location "http://download.eclipse.org/releases/2019-09/" {
// Eclipse 2019-09 RC2 (composite at https://download.eclipse.org/releases/2019-09/)
location "https://download.eclipse.org/releases/2019-09/" {
org.eclipse.sdk.feature.group
org.eclipse.jdt.feature.group
org.eclipse.m2e.feature.feature.group
Expand All @@ -33,7 +33,7 @@ location "http://download.eclipse.org/releases/2019-09/" {
}

// WTP SDKs aren't exposed through the main release links
// (composite at http://download.eclipse.org/webtools/repository/2019-09/)
// (composite at https://download.eclipse.org/webtools/repository/2019-09/)
location "https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0-20190830034720/repository" {
org.eclipse.jst.web_sdk.feature.feature.group
org.eclipse.jst.server_sdk.feature.feature.group
Expand All @@ -44,7 +44,7 @@ location "https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0
org.eclipse.wst.server_adapters.sdk.feature.feature.group
}

location "http://download.eclipse.org/linuxtools/update-2019-09-docker/" {
location "https://download.eclipse.org/linuxtools/update-2019-09-docker/" {
org.eclipse.linuxtools.docker.feature.feature.group
}

Expand Down
Loading