Fix up the GitHub Actions continuous integration

sjcross · Mar 23, 2022 · 772968a · 772968a
1 parent 0c8ca81
commit 772968a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 30 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-main.yml b/.github/workflows/build-main.yml
@@ -13,24 +13,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
-      - name: Cache m2 folder
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-m2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-build-${{ env.cache-name }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Set up JDK 8
+      - name: Set up Java
         uses: actions/setup-java@v2
         with:
           java-version: '8'
           distribution: 'zulu'
+          cache: 'maven'
       - name: Set up CI environment
         run: .github/setup.sh
       - name: Execute the build

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -11,24 +11,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
-      - name: Cache m2 folder
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-m2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-build-${{ env.cache-name }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Set up JDK 8
+      - name: Set up Java
         uses: actions/setup-java@v2
         with:
           java-version: '8'
           distribution: 'zulu'
+          cache: 'maven'
       - name: Set up CI environment
         run: .github/setup.sh
       - name: Execute the build

diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![](https://github.com/imagej/ImageJ/actions/workflows/build-main.yml/badge.svg)](https://github.com/imagej/ImageJ/actions/workflows/build-main.yml)
+
 # ImageJ
 
 ImageJ is [public domain] software for processing and analyzing scientific