From 93b8030404e27e07611189b24c67b6c22a2c497c Mon Sep 17 00:00:00 2001 From: Sean Arms <67096+lesserwhirls@users.noreply.github.com> Date: Fri, 13 Dec 2024 08:34:19 -0700 Subject: [PATCH 1/2] Upgrade github actions --- .github/workflows/deps.yml | 4 ++-- .github/workflows/docs.yml | 15 +++++++++------ .github/workflows/style.yml | 15 +++++++++------ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml index 083993ef2b..af4ffb29a4 100644 --- a/.github/workflows/deps.yml +++ b/.github/workflows/deps.yml @@ -7,9 +7,9 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'temurin' java-version: '17' - name: Build with Gradle (refresh dependencies) run: ./gradlew clean classes testClasses assemble --refresh-dependencies diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fd8983edf9..1f6badd6b2 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,16 +11,19 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup Java 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'temurin' java-version: '17' - name: Cache Gradle packages - uses: actions/cache@v1 + uses: actions/cache@v4 with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - restore-keys: ${{ runner.os }}-gradle + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- - name: Build docs using Gradle run: './gradlew :docs:build' - name: Upload a preview of the rendered html diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 5a6a97bd3d..49dce14313 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -7,15 +7,18 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'temurin' java-version: '17' - name: Cache Gradle packages - uses: actions/cache@v1 + uses: actions/cache@v4 with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - restore-keys: ${{ runner.os }}-gradle + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- - name: Code Style Check with Gradle and Spotless run: ./gradlew clean spotlessCheck From 36d94ad1cca3fa6b404fe002bd61af364f42d43e Mon Sep 17 00:00:00 2001 From: Sean Arms <67096+lesserwhirls@users.noreply.github.com> Date: Fri, 13 Dec 2024 08:36:57 -0700 Subject: [PATCH 2/2] Update codeowners --- .github/CODEOWNERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 375ae32597..56a4429142 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -15,7 +15,7 @@ # users just like we do for commit author emails. # docs/* docs@example.com -* @tdrwenski +* @lesserwhirls ##################### # top level modules # @@ -26,16 +26,16 @@ # classpath / not module specific matches # ########################################### -**/thredds/server/radarServer2/** @dopplershift +**/thredds/server/radarServer2/** @dopplershift @lesserwhirls -**/opendap/** @DennisHeimbigner @tdrwenski -**/dap4/** @DennisHeimbigner @tdrwenski +**/opendap/** @DennisHeimbigner @lesserwhirls +**/dap4/** @DennisHeimbigner @lesserwhirls ###################### # general file types # ###################### -*.py @dopplershift +*.py @dopplershift @lesserwhirls #################### # individual files #