Skip to content

Commit 6efab9e

Browse files
committed
chore: add windows machine in ci
1 parent 3d03bd6 commit 6efab9e

File tree

2 files changed

+11
-24
lines changed

2 files changed

+11
-24
lines changed

.github/workflows/maven.yml

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
# Copyright (c) 2020 Reficio (TM) - Reestablish your software! All Rights Reserved.
2-
#
3-
# Licensed to the Apache Software Foundation (ASF) under one or more
4-
# contributor license agreements. See the NOTICE file distributed with
5-
# this work for additional information regarding copyright ownership.
6-
# The ASF licenses this file to You under the Apache License, Version 2.0
7-
# (the "License"); you may not use this file except in compliance with
8-
# the License. You may obtain a copy of the License at
9-
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
12-
# Unless required by applicable law or agreed to in writing, software
13-
# distributed under the License is distributed on an "AS IS" BASIS,
14-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
# See the License for the specific language governing permissions and
16-
# limitations under the License.
17-
18-
# This workflow will build a Java project with Maven
19-
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
20-
211
name: Java CI with Maven
222

233
on:
@@ -28,16 +8,23 @@ on:
288

299
jobs:
3010
build:
11+
strategy:
12+
matrix:
13+
os: [ ubuntu-latest, windows-latest ]
3114
name: "JDK 21 Eclipse Temurin"
32-
runs-on: ubuntu-latest
33-
container: "maven:3.9.6-eclipse-temurin-21"
15+
runs-on: ${{ matrix.os }}
16+
# container: "maven:3.9.6-eclipse-temurin-21"
3417
steps:
3518
- uses: actions/checkout@v4
3619
- uses: actions/cache@v4
3720
with:
3821
path: ~/.m2/repository
39-
key: maven-jdk17-${{ hashFiles('**/pom.xml') }}
22+
key: maven-jdk17-${{ matrix.os }}-${{ hashFiles('**/pom.xml') }}
4023
restore-keys: maven-jdk17
24+
- uses: actions/setup-java@v4
25+
with:
26+
distribution: 'temurin'
27+
java-version: '17'
4128
- name: 'Build'
4229
run: |
4330
mvn \

testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class GitServerContainerTest {
4646

4747
static Stream<Arguments> publicKeySupportedVersions () {
4848
return Arrays.stream(GitServerVersions.values())
49-
.filter(v -> !(v == GitServerVersions.V2_36 || v == GitServerVersions.V2_34_2 || v == GitServerVersions.V2_34))
49+
// .filter(v -> !(v == GitServerVersions.V2_36 || v == GitServerVersions.V2_34_2 || v == GitServerVersions.V2_34))
5050
.map(Arguments::of);
5151
}
5252

0 commit comments

Comments
 (0)