Skip to content

Commit c357bd1

Browse files
authored
Split CI tests with dockcross flavour and make dockross new test use only latest (#151)
1 parent 577bde9 commit c357bd1

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.github/workflows/tests.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ on:
1111

1212
jobs:
1313
tests:
14-
name: Java ${{ matrix.java-version }} ${{ matrix.os }}
14+
name: Java ${{ matrix.java-version }} ${{ matrix.os }} ${{ matrix.dockcross-only }}
1515
runs-on: ${{ matrix.os }}
1616

1717
strategy:
1818
matrix:
1919
os: [ubuntu-latest]
2020
java-distribution: [adopt]
2121
java-version: [8, 11, 17, 21, 22]
22+
dockcross-only: ["android-arm", "android-arm64", "linux-arm64", "linux-armv5", "linux-armv7", "linux-s390x", "linux-ppc64le", "linux-x64", "linux-x86", "windows-static-x64", "windows-static-x86"]
2223

2324
steps:
2425
- uses: actions/checkout@v2.1.1
@@ -43,7 +44,7 @@ jobs:
4344
run: mvn com.spotify.fmt:fmt-maven-plugin:check
4445

4546
- name: Tests
46-
run: mvn "-Dh3.system.prune=true" -B -V clean test site
47+
run: mvn "-Dh3.system.prune=true" "-Dh3.dockcross.only=${{ matrix.dockcross-only }}" -B -V clean test site
4748

4849
- name: Format check for C
4950
run: git diff --exit-code
@@ -52,7 +53,7 @@ jobs:
5253
name: Upload artifacts
5354
if: ${{ matrix.java-version == 8 }}
5455
with:
55-
name: docker-built-shared-objects
56+
name: docker-built-shared-objects-${{ matrix.dockcross-only }}
5657
path: |
5758
src/main/resources/*/*.so
5859
src/main/resources/*/*.dll
@@ -67,7 +68,7 @@ jobs:
6768
os: [ubuntu-latest]
6869
java-distribution: [adopt]
6970
java-version: [21]
70-
dockcross-tag: ["20230116-670f7f7", "20240418-88c04a4", "latest"]
71+
dockcross-tag: ["latest"]
7172
dockcross-only: ["android-arm", "android-arm64", "linux-arm64", "linux-armv5", "linux-armv7", "linux-s390x", "linux-ppc64le", "linux-x64", "linux-x86", "windows-static-x64", "windows-static-x86"]
7273

7374
steps:
@@ -201,7 +202,8 @@ jobs:
201202
- name: Download Docker binaries
202203
uses: actions/download-artifact@v4.1.7
203204
with:
204-
name: docker-built-shared-objects
205+
pattern: docker-built-shared-objects-*
206+
merge-multiple: true
205207
path: src/main/resources/
206208

207209
- name: Download Mac binaries

0 commit comments

Comments
 (0)