From f6efee1a1a1654788873ee00cf3f46940458ddef Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Thu, 7 Mar 2024 11:49:44 +0100 Subject: [PATCH 1/4] Tycho 4.0.6 --- .../2.35.0/org.eclipse.xtext.example.domainmodel.releng/pom.xml | 2 +- greetings-tycho/2.35.0/org.xtext.example.mydsl.parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/domainmodel/2.35.0/org.eclipse.xtext.example.domainmodel.releng/pom.xml b/domainmodel/2.35.0/org.eclipse.xtext.example.domainmodel.releng/pom.xml index 662f5b33..81ac15ad 100644 --- a/domainmodel/2.35.0/org.eclipse.xtext.example.domainmodel.releng/pom.xml +++ b/domainmodel/2.35.0/org.eclipse.xtext.example.domainmodel.releng/pom.xml @@ -24,7 +24,7 @@ 11 11 - 4.0.4 + 4.0.6 ${project.groupId} ${project.groupId}.tp ${project.version} diff --git a/greetings-tycho/2.35.0/org.xtext.example.mydsl.parent/pom.xml b/greetings-tycho/2.35.0/org.xtext.example.mydsl.parent/pom.xml index 81a2a701..d676fc76 100644 --- a/greetings-tycho/2.35.0/org.xtext.example.mydsl.parent/pom.xml +++ b/greetings-tycho/2.35.0/org.xtext.example.mydsl.parent/pom.xml @@ -13,7 +13,7 @@ 17 17 - 3.0.5 + 4.0.6 From a762ae3b4adddf807a85c35481bc2368b8da5c8f Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Thu, 7 Mar 2024 11:58:03 +0100 Subject: [PATCH 2/4] Use Maven 3.9 for build_tycho_J17 (Tycho 4 requires Maven 3.9) --- .github/workflows/build.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b3e7f0a6..5a578747 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,7 +83,13 @@ jobs: with: distribution: 'temurin' java-version: 17 + - name: Set up Maven 3.9.1 + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.1 - name: Build + env: + EXTRA_ARGS : "-Dtycho-version=4.0.5" run: xvfb-run scripts/greetings-tycho-2.35.sh build_tycho_J11: runs-on: ubuntu-latest @@ -111,7 +117,7 @@ jobs: maven-version: 3.9.1 - name: Build env: - EXTRA_ARGS : "-Dtycho-version=4.0.5" + EXTRA_ARGS : "-Dtycho-version=4.0.5" run: xvfb-run scripts/greetings-tycho-2.35.sh build_tycho_J17_tycho_50: runs-on: ubuntu-latest From 0a3e7241066d695b49eb17d734b0431be36e1126 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Thu, 7 Mar 2024 12:00:02 +0100 Subject: [PATCH 3/4] removed explicit Tycho version from the jobs --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a578747..472ea050 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,8 +88,6 @@ jobs: with: maven-version: 3.9.1 - name: Build - env: - EXTRA_ARGS : "-Dtycho-version=4.0.5" run: xvfb-run scripts/greetings-tycho-2.35.sh build_tycho_J11: runs-on: ubuntu-latest @@ -116,8 +114,6 @@ jobs: with: maven-version: 3.9.1 - name: Build - env: - EXTRA_ARGS : "-Dtycho-version=4.0.5" run: xvfb-run scripts/greetings-tycho-2.35.sh build_tycho_J17_tycho_50: runs-on: ubuntu-latest From 2a95f8ace50c7240685c877f9b9095586862e1fd Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Thu, 7 Mar 2024 13:22:44 +0100 Subject: [PATCH 4/4] removed build_tycho_J17_tycho_40 which is now the same as build_tycho_J17 --- .github/workflows/build.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 472ea050..49363818 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,21 +100,6 @@ jobs: java-version: 11 - name: Build run: xvfb-run scripts/greetings-tycho-2.35-J11.sh - build_tycho_J17_tycho_40: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 17 - - name: Set up Maven 3.9.1 - uses: stCarolas/setup-maven@v4.5 - with: - maven-version: 3.9.1 - - name: Build - run: xvfb-run scripts/greetings-tycho-2.35.sh build_tycho_J17_tycho_50: runs-on: ubuntu-latest steps: