From 8d6729fea97748036099ef5be7f0db49d673577d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 30 Aug 2024 12:49:37 -0500
Subject: [PATCH] CI: consolidate and fix workflows

The mainline branch is main, not master.
---
 .github/workflows/build-pr.yml                | 23 -------------------
 .../workflows/{build-main.yml => build.yml}   |  5 +++-
 2 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 .github/workflows/build-pr.yml
 rename .github/workflows/{build-main.yml => build.yml} (93%)

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
deleted file mode 100644
index 8d4c1f8..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: '11'
-          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 93%
rename from .github/workflows/build-main.yml
rename to .github/workflows/build.yml
index fb81f22..84ccb83 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build.yml
@@ -3,9 +3,12 @@ name: build
 on:
   push:
     branches:
-      - master
+      - main
     tags:
       - "*-[0-9]+.*"
+  pull_request:
+    branches:
+      - main
 
 jobs:
   build: