From 11e99efa2261d06696cf0579dc6db9dede87baf4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 20 Oct 2024 14:38:24 -0500
Subject: [PATCH] CI: update for current best practices

---
 .github/workflows/build-pr.yml                | 23 -------------------
 .../workflows/{build-main.yml => build.yml}   |  4 ++++
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 .github/workflows/build-pr.yml
 rename .github/workflows/{build-main.yml => build.yml} (89%)

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
deleted file mode 100644
index 925b576..0000000
--- a/.github/workflows/build-pr.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: build PR
-
-on:
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Java
-        uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: 'zulu'
-          cache: 'maven'
-      - name: Set up CI environment
-        run: .github/setup.sh
-      - name: Execute the build
-        run: .github/build.sh
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build.yml
similarity index 89%
rename from .github/workflows/build-main.yml
rename to .github/workflows/build.yml
index 5ef5692..232fa9e 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build.yml
@@ -6,6 +6,9 @@ on:
       - master
     tags:
       - "*-[0-9]+.*"
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
@@ -28,5 +31,6 @@ jobs:
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
           MAVEN_USER: ${{ secrets.MAVEN_USER }}
           MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
+          OSSRH_USER: ${{ secrets.OSSRH_USER }}
           OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
           SIGNING_ASC: ${{ secrets.SIGNING_ASC }}