From fe9572103e5d7ee8e1ecb921535bd309c33c3da5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 2 May 2024 14:53:46 -0500
Subject: [PATCH] Update CI configuration

---
 .github/build.sh                              |  2 +-
 .github/workflows/build-pr.yml                | 39 -------------------
 .../workflows/{build-main.yml => build.yml}   |  3 ++
 README.md                                     |  2 +-
 4 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 .github/workflows/build-pr.yml
 rename .github/workflows/{build-main.yml => build.yml} (94%)

diff --git a/.github/build.sh b/.github/build.sh
index 7da42622b..523abeb87 100755
--- a/.github/build.sh
+++ b/.github/build.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh
+curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-build.sh
 sh ci-build.sh
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
deleted file mode 100644
index ca29a99ae..000000000
--- a/.github/workflows/build-pr.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: build PR
-
-on:
-  pull_request:
-    branches:
-      - main
-
-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
-        
-  validate-formatting:
-    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: mvn formatter:validate
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build.yml
similarity index 94%
rename from .github/workflows/build-main.yml
rename to .github/workflows/build.yml
index 1646caa16..84ccb830d 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build.yml
@@ -6,6 +6,9 @@ on:
       - main
     tags:
       - "*-[0-9]+.*"
+  pull_request:
+    branches:
+      - main
 
 jobs:
   build:
diff --git a/README.md b/README.md
index 5171c3dbe..1a70af740 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![](https://github.com/scijava/incubator/actions/workflows/build-main.yml/badge.svg)](https://github.com/scijava/incubator/actions/workflows/build-main.yml)
+[![Build Status](https://github.com/scijava/incubator/actions/workflows/build.yml/badge.svg)](https://github.com/scijava/incubator/actions/workflows/build.yml)
 
 # SciJava Incubator: A staging ground for fledgling SciJava projects