Update CI configuration to latest version

fiji · Apr 23, 2024 · 2aa6c6c · 2aa6c6c
1 parent b0df4db
commit 2aa6c6c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 27 deletions.
diff --git 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/setup.sh b/.github/setup.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-setup-github-actions.sh
+curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-setup-github-actions.sh
 sh ci-setup-github-actions.sh
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
diff --git a/.github/workflows/build-main.yml → .github/workflows/build.yml b/.github/workflows/build-main.yml → .github/workflows/build.yml
@@ -3,9 +3,12 @@ name: build
 on:
   push:
     branches:
-      - master
+      - main
     tags:
       - "*-[0-9]+.*"
+  pull_request:
+    branches:
+      - main
 
 jobs:
   build:

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![](https://github.com/fiji/simplified-io/actions/workflows/build-main.yml/badge.svg)](https://github.com/fiji/simplified-io/actions/workflows/build-main.yml)
+[![Build Status](https://github.com/fiji/simplified-io/actions/workflows/build.yml/badge.svg)](https://github.com/fiji/simplified-io/actions/workflows/build.yml)
 
 Simplified-IO
 =============