From 7bdb3c78a04c6bce6f779a3185fdb8f63f6921e4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 11 Oct 2023 16:10:44 +0200
Subject: [PATCH] CI: combine dual workflows into one

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

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
deleted file mode 100644
index 925b57658..000000000
--- 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 94%
rename from .github/workflows/build-main.yml
rename to .github/workflows/build.yml
index 5ef569202..2fa1522d3 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,9 @@
 name: build
 
 on:
+  pull_request:
+    branches:
+      - master
   push:
     branches:
       - master
diff --git a/README.md b/README.md
index 6a69bf198..ba1f15173 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![](https://img.shields.io/maven-central/v/org.scijava/scijava-common.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.scijava%22%20AND%20a%3A%22scijava-common%22)
-[![](https://github.com/scijava/scijava-common/actions/workflows/build-main.yml/badge.svg)](https://github.com/scijava/scijava-common/actions/workflows/build-main.yml)
+[![](https://github.com/scijava/scijava-common/actions/workflows/build.yml/badge.svg)](https://github.com/scijava/scijava-common/actions/workflows/build.yml)
 [![developer chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://imagesc.zulipchat.com/#narrow/stream/327237-SciJava)
 
 SciJava Common is a common library for SciJava software. It provides a