Skip to content

Commit 7208de2

Browse files
lesserwhirlslesserwhirls
authored
Merge pull request #1524 from lesserwhirls/gha
Update github actions
2 parents 6cf812f + a795473 commit 7208de2

File tree

10 files changed

+44
-32
lines changed

10 files changed

+44
-32
lines changed

‎.github/workflows/deps.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
name: Check fresh compile and assemble of netCDF-Java project
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v4
8+
- uses: actions/checkout@v6
99
- name: Set up JDK 17
1010
uses: actions/setup-java@v5
1111
with:

‎.github/workflows/docs-tutorials.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
name: netCDF-Java Documentation Code Deprecation Check
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v6
1010
- name: Setup Java 8, 17
1111
uses: actions/setup-java@v5
1212
with:
@@ -15,7 +15,7 @@ jobs:
1515
8
1616
17
1717
- name: Cache Gradle packages
18-
uses: actions/cache@v4
18+
uses: actions/cache@v5
1919
with:
2020
path: |
2121
~/.gradle/caches

‎.github/workflows/docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ jobs:
1010
name: netCDF-Java Documentation Build Check
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v6
1414
- name: Set up JDK 17
1515
uses: actions/setup-java@v5
1616
with:
1717
distribution: 'temurin'
1818
java-version: '17'
1919
- name: Cache Gradle packages
20-
uses: actions/cache@v4
20+
uses: actions/cache@v5
2121
with:
2222
path: |
2323
~/.gradle/caches
@@ -29,7 +29,7 @@ jobs:
2929
run: ./gradlew buildJekyllSite
3030
- if: success()
3131
name: Upload a preview of the rendered html
32-
uses: actions/upload-artifact@v4
32+
uses: actions/upload-artifact@v6
3333
with:
3434
name: documentation_${{ github.sha }}
3535
path: docs/build/site

‎.github/workflows/libaec.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ${{ matrix.build_env.os }}
3333

3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v6
3636
with:
3737
repository: 'MathisRosenhauer/libaec'
3838
ref: 'v1.1.3'
@@ -67,7 +67,7 @@ jobs:
6767
cp ${{ matrix.build_env.lib }} resources/${{ matrix.build_env.jna_id }}
6868
6969
- name: Upload ${{ matrix.build_env.jna_id }} artifact
70-
uses: actions/upload-artifact@v4
70+
uses: actions/upload-artifact@v6
7171
with:
7272
name: libaec-${{ matrix.build_env.jna_id }}
7373
path: ${{ steps.strings.outputs.build-dir }}/resources
@@ -78,7 +78,7 @@ jobs:
7878
runs-on: ubuntu-latest
7979

8080
steps:
81-
- uses: actions/download-artifact@v4
81+
- uses: actions/download-artifact@v7
8282
with:
8383
pattern: libaec-*
8484
path: native/resources/
@@ -88,7 +88,7 @@ jobs:
8888
run: find native/ -type f -exec ls -lh {} \;
8989

9090
- name: Upload merged artifact
91-
uses: actions/upload-artifact@v4
91+
uses: actions/upload-artifact@v6
9292
with:
9393
name: libaec-native-1.1.3-${{ github.sha }}
9494
path: native/

‎.github/workflows/libblosc2.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: |
2929
echo "build-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
3030
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v6
3232
with:
3333
repository: 'Blosc/c-blosc2'
3434
ref: "v2.22.0"
@@ -58,7 +58,7 @@ jobs:
5858
cp -L ${{ matrix.build_env.lib }} resources/${{ matrix.build_env.jna_id }}
5959
6060
- name: Upload ${{ matrix.build_env.jna_id }} artifact
61-
uses: actions/upload-artifact@v4
61+
uses: actions/upload-artifact@v6
6262
with:
6363
name: libblosc2-${{ matrix.build_env.jna_id }}
6464
path: ${{ steps.strings.outputs.build-dir }}/resources
@@ -69,7 +69,7 @@ jobs:
6969
runs-on: ubuntu-latest
7070

7171
steps:
72-
- uses: actions/download-artifact@v4
72+
- uses: actions/download-artifact@v7
7373
with:
7474
pattern: libblosc2-*
7575
path: native/resources/
@@ -79,7 +79,7 @@ jobs:
7979
run: find native/ -type f -exec ls -lh {} \;
8080

8181
- name: Upload merged artifact
82-
uses: actions/upload-artifact@v4
82+
uses: actions/upload-artifact@v6
8383
with:
8484
name: libblosc2-native-2.22.0-${{ github.sha }}
8585
path: native/

‎.github/workflows/style.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ jobs:
55
name: Code Style Check
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v4
8+
- uses: actions/checkout@v6
99
- name: Set up JDK 17
1010
uses: actions/setup-java@v5
1111
with:
1212
distribution: 'temurin'
1313
java-version: '17'
1414
- name: Cache Gradle packages
15-
uses: actions/cache@v4
15+
uses: actions/cache@v5
1616
with:
1717
path: |
1818
~/.gradle/caches

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
name: netCDF-Java Native Compression Tests
2323
runs-on: ${{ matrix.os }}
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v6
2626
- name: Setup JDK 8, 17
2727
if: ${{ matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-15-intel' }}
2828
uses: actions/setup-java@v5
@@ -38,7 +38,7 @@ jobs:
3838
distribution: 'temurin'
3939
java-version: '21'
4040
- name: Cache Gradle packages
41-
uses: actions/cache@v4
41+
uses: actions/cache@v5
4242
with:
4343
path: |
4444
~/.gradle/caches
@@ -54,7 +54,7 @@ jobs:
5454
- name: Run libaec JNA tests (JDK 21 tests)
5555
if: ${{ matrix.os != 'ubuntu-24.04' && matrix.os != 'macos-15-intel' }}
5656
run: ./gradlew clean :libaec-jna:test21
57-
- uses: actions/upload-artifact@v4
57+
- uses: actions/upload-artifact@v6
5858
if: failure()
5959
with:
6060
name: NativeCompression_JUnit_Results_${{ github.sha }}_-${{ matrix.os }}

‎.github/workflows/tests.yml‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,35 @@ jobs:
77
strategy:
88
matrix:
99
# test against latest 8, 11, 17, 21 of zulu and temurin java
10-
java-version: [8, 11, 17, 21]
11-
java-vendor: ['zulu', 'temurin', 'corretto']
10+
java-version: [8, 11, 17, 21, 25]
11+
java-vendor: ['temurin', 'corretto']
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v6
14+
- name: Build with ${{ matrix.java-vendor }} 17 and run tests with ${{ matrix.java-vendor }} 8
15+
if: ${{ matrix.java-version == 8 }}
16+
uses: Unidata/thredds-test-action@v4
17+
with:
18+
java-vendor: ${{ matrix.java-vendor }}
19+
java-version: 17
20+
build-tool: 'gradlew'
21+
test-command: '-Dorg.gradle.java.installations.fromEnv=TEST_JDK --info --stacktrace test'
22+
env:
23+
TEST_JDK: /usr/thredds-test-environment/${{ matrix.java-vendor }}8
1424
- name: Build with ${{ matrix.java-vendor }} 17 and run tests with ${{ matrix.java-vendor }} ${{ matrix.java-version }}
15-
uses: Unidata/thredds-test-action@v3
25+
if: ${{ matrix.java-version != 8 }}
26+
uses: Unidata/thredds-test-action@v4
1627
with:
1728
java-vendor: ${{ matrix.java-vendor }}
1829
java-version: 17
1930
build-tool: 'gradlew'
20-
test-command: '-Dorg.gradle.java.installations.fromEnv=JDK8 --info --stacktrace test'
31+
test-command: '-Dorg.gradle.java.installations.fromEnv=TEST_JDK --info --stacktrace testWithJdk${{ matrix.java-version }}'
2132
env:
22-
JDK8: /usr/thredds-test-environment/${{ matrix.java-vendor }}8
23-
- name: Prep for artifact upload
33+
TEST_JDK: /usr/thredds-test-environment/${{ matrix.java-vendor }}${{ matrix.java-version }}
34+
- name: Cleanup build-logic-ncj build directory
2435
if: failure()
25-
run: rm -rf build-logic-ncj/build/tmp
26-
- uses: actions/upload-artifact@v4
36+
run: sudo rm -rf build-logic-ncj/build/
37+
- uses: actions/upload-artifact@v6
2738
if: failure()
2839
with:
2940
name: netCDF-Java_JUnit_Results_${{ github.sha }}_${{ matrix.java-vendor }}-${{ matrix.java-version }}
30-
path: |
31-
${{ github.workspace }}/**/build/reports/tests/**/*
41+
path: ${{ github.workspace }}/**/build/reports/*

‎bufr/src/main/java/ucar/nc2/iosp/bufr/tables/BufrTables.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ public static synchronized void addLookupFile(String filename) throws FileNotFou
140140
if (lookups == null)
141141
lookups = new ArrayList<>();
142142
File f = new File(filename);
143+
if (f.isDirectory())
144+
throw new FileNotFoundException(filename + " is a directory");
143145
if (!f.exists())
144146
throw new FileNotFoundException(filename + " not found");
145147
lookups.add(filename);

‎cdm/gcdm/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import com.github.psxpaul.task.JavaExecFork
77
import com.google.protobuf.gradle.id
8+
import org.gradle.kotlin.dsl.get
89

910
plugins {
1011
id("ncj-java-library-conventions")
@@ -83,7 +84,6 @@ val startDaemon =
8384
waitForPort = 16111
8485
waitForOutput = "Server started, listening on 16111"
8586
dependsOn(tasks.testClasses)
86-
doLast { stopAfter = tasks.named("test") }
8787
}
8888

89-
tasks.test { dependsOn(startDaemon) }
89+
tasks.withType<Test> { dependsOn(startDaemon) }

0 commit comments

Comments
 (0)