Skip to content

Commit 012786e

Browse files
authored
Merge pull request #1398 from lesserwhirls/actions
2 parents 7f24638 + 02b5072 commit 012786e

7 files changed

Lines changed: 40 additions & 137 deletions

File tree

.github/CODEOWNERS

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,30 @@
1515
# users just like we do for commit author emails.
1616
# docs/* docs@example.com
1717

18-
* @tdrwenski
18+
* @lesserwhirls
1919

2020
#####################
2121
# top level modules #
2222
#####################
2323

24-
httpservices/** @DennisHeimbigner @tdrwenski
25-
netcdf4/** @DennisHeimbigner @tdrwenski
24+
httpservices/** @DennisHeimbigner @lesserwhirls
25+
netcdf4/** @DennisHeimbigner @lesserwhirls
2626

2727
###########################################
2828
# classpath / not module specific matches #
2929
###########################################
3030

31-
**/iosp/nids/** @dopplershift @tdrwenski
31+
**/iosp/nids/** @dopplershift @lesserwhirls
3232

33-
**/opendap/** @DennisHeimbigner @tdrwenski
34-
**/dap4/** @DennisHeimbigner @tdrwenski
33+
**/opendap/** @DennisHeimbigner @lesserwhirls
34+
**/dap4/** @DennisHeimbigner @lesserwhirls
3535

3636
######################
3737
# general file types #
3838
######################
3939

4040
*.py @dopplershift
41-
**/test/**/*.py @tdrwenski
41+
**/test/**/*.py @lesserwhirls
4242

4343
####################
4444
# individual files #

.github/workflows/deps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ jobs:
77
steps:
88
- uses: actions/checkout@v4
99
- name: Set up JDK 11
10-
uses: actions/setup-java@v2
10+
uses: actions/setup-java@v4
1111
with:
12-
distribution: 'adopt'
12+
distribution: 'temurin'
1313
java-version: '11'
1414
- name: Build with Gradle (refresh dependencies)
1515
run: ./gradlew clean classes testClasses assemble --refresh-dependencies

.github/workflows/docs-tutorials.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@ jobs:
88
steps:
99
- uses: actions/checkout@v4
1010
- name: Setup Java 8
11-
uses: actions/setup-java@v2
11+
uses: actions/setup-java@v4
1212
with:
13-
distribution: 'zulu'
13+
distribution: 'temurin'
1414
java-version: '8'
1515
- name: Cache Gradle packages
16-
uses: actions/cache@v1
16+
uses: actions/cache@v4
1717
with:
18-
path: ~/.gradle/caches
19-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
20-
restore-keys: ${{ runner.os }}-gradle
18+
path: |
19+
~/.gradle/caches
20+
~/.gradle/wrapper
21+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
22+
restore-keys: |
23+
${{ runner.os }}-gradle-
2124
- name: Check netCDF-Java documentation for deprecations warnings
2225
run: './gradlew :docs:testClasses |& (! grep -F "warning: [deprecation]")'

.github/workflows/docs.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,19 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414
- name: Set up JDK 11
15-
uses: actions/setup-java@v2
15+
uses: actions/setup-java@v4
1616
with:
17-
distribution: 'adopt'
17+
distribution: 'temurin'
1818
java-version: '11'
1919
- name: Cache Gradle packages
20-
uses: actions/cache@v1
20+
uses: actions/cache@v4
2121
with:
22-
path: ~/.gradle/caches
23-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
24-
restore-keys: ${{ runner.os }}-gradle
22+
path: |
23+
~/.gradle/caches
24+
~/.gradle/wrapper
25+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
26+
restore-keys: |
27+
${{ runner.os }}-gradle-
2528
- name: Build docs using Gradle
2629
run: ./gradlew buildJekyllSite
2730
- if: success()

.github/workflows/style.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@ jobs:
77
steps:
88
- uses: actions/checkout@v4
99
- name: Set up JDK 11
10-
uses: actions/setup-java@v2
10+
uses: actions/setup-java@v4
1111
with:
12-
distribution: 'adopt'
12+
distribution: 'temurin'
1313
java-version: '11'
1414
- name: Cache Gradle packages
15-
uses: actions/cache@v1
15+
uses: actions/cache@v4
1616
with:
17-
path: ~/.gradle/caches
18-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
19-
restore-keys: ${{ runner.os }}-gradle
17+
path: |
18+
~/.gradle/caches
19+
~/.gradle/wrapper
20+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
21+
restore-keys: |
22+
${{ runner.os }}-gradle-
2023
- name: Code Style Check with Gradle and Spotless
2124
run: ./gradlew clean spotlessCheck

.github/workflows/tds-check.yml

Lines changed: 0 additions & 106 deletions
This file was deleted.

opendap/src/test/java/ucar/nc2/dods/TestDodsV.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import opendap.dap.DConnect2;
77
import opendap.dap.DDS;
88
import org.junit.Test;
9+
import org.junit.experimental.categories.Category;
10+
import ucar.unidata.util.test.category.NotPullRequest;
911

1012
public class TestDodsV {
1113

@@ -30,11 +32,9 @@ private static void doit(String urlName) throws IOException, DAP2Exception {
3032
}
3133

3234
@Test
35+
@Category(NotPullRequest.class)
3336
public void testStuff() throws IOException, DAP2Exception {
3437
// doit("http://localhost:8080/thredds/dodsC/ncdodsTest/conventions/zebra/SPOL_3Volumes.nc");
35-
doit("http://iridl.ldeo.columbia.edu/SOURCES/.CAYAN/dods");
38+
doit("https://iridl.ldeo.columbia.edu/SOURCES/.CAYAN/dods");
3639
}
37-
38-
39-
4040
}

0 commit comments

Comments
 (0)