From 6efab9e383388c01917c85e939ef32360e5ab6d9 Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Mon, 4 Mar 2024 08:03:03 +0100 Subject: [PATCH 1/5] chore: add windows machine in ci --- .github/workflows/maven.yml | 33 ++++++------------- .../plain/GitServerContainerTest.java | 2 +- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a8a8b30..c91ba91 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,23 +1,3 @@ -# Copyright (c) 2020 Reficio (TM) - Reestablish your software! All Rights Reserved. -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - name: Java CI with Maven on: @@ -28,16 +8,23 @@ on: jobs: build: + strategy: + matrix: + os: [ ubuntu-latest, windows-latest ] name: "JDK 21 Eclipse Temurin" - runs-on: ubuntu-latest - container: "maven:3.9.6-eclipse-temurin-21" + runs-on: ${{ matrix.os }} +# container: "maven:3.9.6-eclipse-temurin-21" steps: - uses: actions/checkout@v4 - uses: actions/cache@v4 with: path: ~/.m2/repository - key: maven-jdk17-${{ hashFiles('**/pom.xml') }} + key: maven-jdk17-${{ matrix.os }}-${{ hashFiles('**/pom.xml') }} restore-keys: maven-jdk17 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '17' - name: 'Build' run: | mvn \ diff --git a/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java b/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java index 5dd4de4..c2ee42b 100644 --- a/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java +++ b/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java @@ -46,7 +46,7 @@ public class GitServerContainerTest { static Stream publicKeySupportedVersions () { return Arrays.stream(GitServerVersions.values()) - .filter(v -> !(v == GitServerVersions.V2_36 || v == GitServerVersions.V2_34_2 || v == GitServerVersions.V2_34)) +// .filter(v -> !(v == GitServerVersions.V2_36 || v == GitServerVersions.V2_34_2 || v == GitServerVersions.V2_34)) .map(Arguments::of); } From 82db462b083a4fe73141d2a423097678b0ac6552 Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Mon, 4 Mar 2024 08:15:46 +0100 Subject: [PATCH 2/5] chore: add windows machine in ci --- .github/workflows/maven.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c91ba91..06d18c8 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -25,6 +25,9 @@ jobs: with: distribution: 'temurin' java-version: '17' + - uses: stCarolas/setup-maven@v5 + with: + maven-version: 3.9.6 - name: 'Build' run: | mvn \ From f852163528235764842ca8a4e3e461df10492002 Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Mon, 4 Mar 2024 08:21:39 +0100 Subject: [PATCH 3/5] chore: add windows machine in ci --- .github/workflows/maven.yml | 44 ++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 06d18c8..f91010a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -7,27 +7,17 @@ on: branches: [ main ] jobs: - build: - strategy: - matrix: - os: [ ubuntu-latest, windows-latest ] + linux-build: name: "JDK 21 Eclipse Temurin" - runs-on: ${{ matrix.os }} -# container: "maven:3.9.6-eclipse-temurin-21" + runs-on: ubuntu-latest + container: "maven:3.9.6-eclipse-temurin-21" steps: - uses: actions/checkout@v4 - uses: actions/cache@v4 with: path: ~/.m2/repository - key: maven-jdk17-${{ matrix.os }}-${{ hashFiles('**/pom.xml') }} + key: maven-jdk17-${{ hashFiles('**/pom.xml') }} restore-keys: maven-jdk17 - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '17' - - uses: stCarolas/setup-maven@v5 - with: - maven-version: 3.9.6 - name: 'Build' run: | mvn \ @@ -41,4 +31,28 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} files: ./rewrite-testcontainers-gitserver/target/site/jacoco/jacoco.xml, ./testcontainers-gitserver/target/site/jacoco/jacoco.xml fail_ci_if_error: true - verbose: false \ No newline at end of file + verbose: false + windows-build: + name: "JDK 21 Eclipse Temurin" + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/cache@v4 + with: + path: ~/.m2/repository + key: maven-jdk17-windows-${{ hashFiles('**/pom.xml') }} + restore-keys: maven-jdk17 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '17' + - uses: stCarolas/setup-maven@v5 + with: + maven-version: 3.9.6 + - name: 'Build' + run: | + mvn + --fail-at-end \ + --batch-mode \ + --no-transfer-progress \ + clean verify \ \ No newline at end of file From 513c1d85097a66d66c067e01f53c9adab0b66ffb Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Mon, 4 Mar 2024 08:22:38 +0100 Subject: [PATCH 4/5] chore: add windows machine in ci --- .github/workflows/maven.yml | 50 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f91010a..3c55492 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -8,7 +8,7 @@ on: jobs: linux-build: - name: "JDK 21 Eclipse Temurin" + name: "JDK 21 Eclipse Temurin Linux" runs-on: ubuntu-latest container: "maven:3.9.6-eclipse-temurin-21" steps: @@ -32,27 +32,27 @@ jobs: files: ./rewrite-testcontainers-gitserver/target/site/jacoco/jacoco.xml, ./testcontainers-gitserver/target/site/jacoco/jacoco.xml fail_ci_if_error: true verbose: false - windows-build: - name: "JDK 21 Eclipse Temurin" - runs-on: windows-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/cache@v4 - with: - path: ~/.m2/repository - key: maven-jdk17-windows-${{ hashFiles('**/pom.xml') }} - restore-keys: maven-jdk17 - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '17' - - uses: stCarolas/setup-maven@v5 - with: - maven-version: 3.9.6 - - name: 'Build' - run: | - mvn - --fail-at-end \ - --batch-mode \ - --no-transfer-progress \ - clean verify \ \ No newline at end of file + windows-build: + name: "JDK 21 Eclipse Temurin Windows" + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/cache@v4 + with: + path: ~/.m2/repository + key: maven-jdk17-windows-${{ hashFiles('**/pom.xml') }} + restore-keys: maven-jdk17 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '17' + - uses: stCarolas/setup-maven@v5 + with: + maven-version: 3.9.6 + - name: 'Build' + run: | + mvn + --fail-at-end \ + --batch-mode \ + --no-transfer-progress \ + clean verify \ \ No newline at end of file From 3e14f9b43c5aebb33dfa8b7d33d9e3d02d42e38f Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Mon, 4 Mar 2024 08:28:23 +0100 Subject: [PATCH 5/5] chore: add windows machine in ci --- .github/workflows/maven.yml | 6 +----- .../gitserver/plain/GitServerContainerTest.java | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 3c55492..e32b8c3 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -51,8 +51,4 @@ jobs: maven-version: 3.9.6 - name: 'Build' run: | - mvn - --fail-at-end \ - --batch-mode \ - --no-transfer-progress \ - clean verify \ \ No newline at end of file + mvn --fail-at-end --batch-mode --no-transfer-progress clean verify \ No newline at end of file diff --git a/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java b/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java index c2ee42b..5dd4de4 100644 --- a/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java +++ b/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java @@ -46,7 +46,7 @@ public class GitServerContainerTest { static Stream publicKeySupportedVersions () { return Arrays.stream(GitServerVersions.values()) -// .filter(v -> !(v == GitServerVersions.V2_36 || v == GitServerVersions.V2_34_2 || v == GitServerVersions.V2_34)) + .filter(v -> !(v == GitServerVersions.V2_36 || v == GitServerVersions.V2_34_2 || v == GitServerVersions.V2_34)) .map(Arguments::of); }