Skip to content

Commit c1f00b0

Browse files
committed
Update github actions
1 parent 14482b9 commit c1f00b0

File tree

6 files changed

+42
-24
lines changed

6 files changed

+42
-24
lines changed

.github/workflows/deps.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- uses: actions/checkout@v4
9-
- name: Set up JDK 11
10-
uses: actions/setup-java@v4
9+
- name: Set up JDK 17
10+
uses: actions/setup-java@v5
1111
with:
1212
distribution: 'temurin'
13-
java-version: '11'
13+
java-version: |
14+
8
15+
17
1416
- name: Build with Gradle (refresh dependencies)
1517
run: ./gradlew clean classes testClasses assemble --refresh-dependencies
1618
- name: Build sourceJars

.github/workflows/docs-tutorials.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v4
10-
- name: Setup Java 8
11-
uses: actions/setup-java@v4
10+
- name: Setup Java 8, 17
11+
uses: actions/setup-java@v5
1212
with:
1313
distribution: 'temurin'
14-
java-version: '8'
14+
java-version: |
15+
8
16+
17
1517
- name: Cache Gradle packages
1618
uses: actions/cache@v4
1719
with:

.github/workflows/docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4
14-
- name: Set up JDK 11
15-
uses: actions/setup-java@v4
14+
- name: Set up JDK 17
15+
uses: actions/setup-java@v5
1616
with:
1717
distribution: 'temurin'
18-
java-version: '11'
18+
java-version: '17'
1919
- name: Cache Gradle packages
2020
uses: actions/cache@v4
2121
with:

.github/workflows/style.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- uses: actions/checkout@v4
9-
- name: Set up JDK 11
10-
uses: actions/setup-java@v4
9+
- name: Set up JDK 17
10+
uses: actions/setup-java@v5
1111
with:
1212
distribution: 'temurin'
13-
java-version: '11'
13+
java-version: '17'
1414
- name: Cache Gradle packages
1515
uses: actions/cache@v4
1616
with:
@@ -20,5 +20,7 @@ jobs:
2020
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
2121
restore-keys: |
2222
${{ runner.os }}-gradle-
23-
- name: Code Style Check with Gradle and Spotless
23+
- name: build-logic Code Style Check with Gradle and Spotless
24+
run: ./gradlew :build-logic:clean :build-logic:spotlessCheck
25+
- name: netCDF-Java Code Style Check with Gradle and Spotless
2426
run: ./gradlew clean spotlessCheck

.github/workflows/test-native-compression.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,17 @@ jobs:
2424
runs-on: ${{ matrix.os }}
2525
steps:
2626
- uses: actions/checkout@v4
27-
- name: Set up JDK 11
28-
if: ${{ matrix.os != 'windows-11-arm' }}
29-
uses: actions/setup-java@v4
27+
- name: Set up JDK 8, 17
28+
if: ${{ matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-13' }}
29+
uses: actions/setup-java@v5
3030
with:
3131
distribution: 'temurin'
32-
java-version: '11'
32+
java-version: |
33+
8
34+
17
3335
- name: Set up JDK 21
34-
if: ${{ matrix.os == 'windows-11-arm' }}
35-
uses: actions/setup-java@v4
36+
if: ${{ matrix.os != 'ubuntu-24.04' && matrix.os != 'macos-13' }}
37+
uses: actions/setup-java@v5
3638
with:
3739
distribution: 'temurin'
3840
java-version: '21'
@@ -46,7 +48,13 @@ jobs:
4648
restore-keys: |
4749
${{ runner.os }}-gradle-
4850
- name: Run libaec JNA tests
49-
run: ./gradlew clean :native-compression:libaec-jna:simpleTests
51+
if: ${{ matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-13' }}
52+
run: ./gradlew -Dorg.gradle.java.installations.auto-detect=true clean :libaec-jna:test
53+
env:
54+
JDK8: /usr/thredds-test-environment/temurin8
55+
- name: Run libaec JNA tests (JDK 21 tests)
56+
if: ${{ matrix.os != 'ubuntu-24.04' && matrix.os != 'macos-13' }}
57+
run: ./gradlew clean :libaec-jna:test21
5058
- uses: actions/upload-artifact@v4
5159
if: failure()
5260
with:

.github/workflows/tests.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,19 @@ jobs:
1111
java-vendor: ['zulu', 'temurin', 'corretto']
1212
steps:
1313
- uses: actions/checkout@v4
14-
- name: Build and test with Gradle (${{ matrix.java-vendor }} ${{ matrix.java-version }})
14+
- name: Build with ${{ matrix.java-vendor }} 17 and run tests with ${{ matrix.java-vendor }} ${{ matrix.java-version }}
1515
uses: Unidata/thredds-test-action@v3
1616
with:
1717
java-vendor: ${{ matrix.java-vendor }}
18-
java-version: ${{ matrix.java-version }}
18+
java-version: 17
1919
build-tool: 'gradlew'
20-
test-command: '--info --stacktrace testAll'
20+
test-command: '-Dorg.gradle.java.installations.fromEnv=JDK8 --info --stacktrace test'
21+
env:
22+
JDK8: /usr/thredds-test-environment/${{ matrix.java-vendor }}8
2123
- uses: actions/upload-artifact@v4
2224
if: failure()
2325
with:
2426
name: netCDF-Java_JUnit_Results_${{ github.sha }}_${{ matrix.java-vendor }}-${{ matrix.java-version }}
25-
path: build/reports/allTests
27+
path: |
28+
${{ github.workspace }}/**/build/reports/tests/**/*
29+
!${{ github.workspace }}/build-logic/**/*

0 commit comments

Comments
 (0)