From ceac2bcf7fee689e6e0a25786fe06277dd1eaae2 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 16 Oct 2026 09:52:47 +0200 Subject: [PATCH 1/6] Add troubleshooting step to CI workflow Signed-off-by: Max Kasperowski --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 257a85b78..2c59fa4e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,6 +39,8 @@ jobs: with: distribution: 'zulu' java-version: ${{ matrix.java-version }} + - name: troubleshoot + run: mvn --version - name: Build and verify with maven # Run mvn in the 'build' folder working-directory: /home/runner/work/elk/elk/elk/build/ From 184a160f94e2e77a24ac3b6aac275d107c30249c Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 16 Oct 2026 10:06:00 +0200 Subject: [PATCH 2/6] Remove Maven cache step from CI workflow Removed caching step for Maven dependencies in CI workflow. Signed-off-by: Max Kasperowski --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c59fa4e2..c6306d9cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,12 +28,6 @@ jobs: repository: eclipse-elk/elk-models path: elk-models # Prepare and use a cache for maven - - uses: actions/cache@v4 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Set up Java version ${{ matrix.java-version }} uses: actions/setup-java@v4 with: From 0ac167b148120765ccefaec4ca2a317f948d0da2 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 16 Oct 2026 10:14:42 +0200 Subject: [PATCH 3/6] Add Maven caching and installation steps in CI Signed-off-by: Max Kasperowski --- .github/workflows/ci.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6306d9cc..3ceaba149 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,13 +28,26 @@ jobs: repository: eclipse-elk/elk-models path: elk-models # Prepare and use a cache for maven + - uses: actions/cache@v4 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Set up Java version ${{ matrix.java-version }} uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: ${{ matrix.java-version }} - - name: troubleshoot - run: mvn --version + - name: Install Maven + run: | + MAVEN_VERSION=3.9.16 + curl -fsSLO "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" + tar -xzf "apache-maven-${MAVEN_VERSION}-bin.tar.gz" + echo "$PWD/apache-maven-${MAVEN_VERSION}/bin" >> "$GITHUB_PATH" + rm "apache-maven-${MAVEN_VERSION}-bin.tar.gz" + - name: Verify Maven version + run: mvn -version - name: Build and verify with maven # Run mvn in the 'build' folder working-directory: /home/runner/work/elk/elk/elk/build/ From 91492f2e08115149c47fa1a43204d063587bdc13 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 16 Oct 2026 10:24:38 +0200 Subject: [PATCH 4/6] bump to tycho 4.0.13 --- build/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pom.xml b/build/pom.xml index 261f9831d..d46721936 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -533,7 +533,7 @@ org.eclipse.tycho target-platform-configuration - [4.0.12,) + [4.0.13,) target-platform From bbeda9dde28bce5d2167559d4785eadb8c181bfb Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 16 Oct 2026 10:25:24 +0200 Subject: [PATCH 5/6] Remove Maven version verification step Removed the step to verify Maven version from CI workflow. Signed-off-by: Max Kasperowski --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ceaba149..4e374060f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,8 +46,6 @@ jobs: tar -xzf "apache-maven-${MAVEN_VERSION}-bin.tar.gz" echo "$PWD/apache-maven-${MAVEN_VERSION}/bin" >> "$GITHUB_PATH" rm "apache-maven-${MAVEN_VERSION}-bin.tar.gz" - - name: Verify Maven version - run: mvn -version - name: Build and verify with maven # Run mvn in the 'build' folder working-directory: /home/runner/work/elk/elk/elk/build/ From 20b0613d7fd8b662e6c0065443cea141ebe79b1f Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Tue, 20 Oct 2026 09:29:54 +0200 Subject: [PATCH 6/6] update tycho version --- build/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pom.xml b/build/pom.xml index d46721936..039bb7380 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -30,7 +30,7 @@ ${targetJdk} ${targetJdk} ${targetJdk} - 4.0.12 + 4.0.13 2.36.0 ${project.version}