Merge pull request #470 from xtext/cd-dm-j21-only

ditch domain j17 build
xtext · Jan 12, 2025 · 979bbf9 · 979bbf9
2 parents 5040290 + a69b979
commit 979bbf9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 24 deletions.
diff --git a/.github/workflows/build-integtests-wizard.yml b/.github/workflows/build-integtests-wizard.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
       - name: Set up Maven 3.9.9
         uses: stCarolas/setup-maven@v5
         with:

diff --git a/.github/workflows/build-integtests-xtend.yml b/.github/workflows/build-integtests-xtend.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
       - name: Set up Maven 3.9.9
         uses: stCarolas/setup-maven@v5
         with:

diff --git a/.github/workflows/build-integtests-xtext.yml b/.github/workflows/build-integtests-xtext.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
       - name: Set up Maven 3.9.9
         uses: stCarolas/setup-maven@v5
         with:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -136,21 +136,6 @@ jobs:
         env:
           EXTRA_ARGS : "-Dtycho-version=5.0.0-SNAPSHOT -Ptycho_snapshots" 
         run: xvfb-run scripts/greetings-tycho-2.38.sh
-  build_domain:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 17
-      - name: Set up Maven 3.9.1
-        uses: stCarolas/setup-maven@v5
-        with:
-          maven-version: 3.9.1
-      - name: Build
-        run: xvfb-run scripts/domainmodel-2.38.sh
   build_domain_J21:
     runs-on: ubuntu-latest
     steps:
@@ -166,15 +151,15 @@ jobs:
           maven-version: 3.9.1
       - name: Build
         run: xvfb-run scripts/domainmodel-2.38.sh
-  build_domain_tycho_50_J17:
+  build_domain_tycho_50_J21:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
       - name: Set up Maven 3.9.9
         uses: stCarolas/setup-maven@v5
         with:

diff --git a/domainmodel/2.38.0/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target b/domainmodel/2.38.0/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <target name="domainmodel" sequenceNumber="1">
+  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>