Skip to content

Commit 772968a

Browse files
committed
Fix up the GitHub Actions continuous integration
1 parent 0c8ca81 commit 772968a

File tree

5 files changed

+8
-30
lines changed

5 files changed

+8
-30
lines changed

.github/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh
2+
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-build.sh
33
sh ci-build.sh

.github/setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-setup-github-actions.sh
2+
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-setup-github-actions.sh
33
sh ci-setup-github-actions.sh

.github/workflows/build-main.yml

+2-14
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,12 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16-
17-
- name: Cache m2 folder
18-
uses: actions/cache@v2
19-
env:
20-
cache-name: cache-m2
21-
with:
22-
path: ~/.m2/repository
23-
key: ${{ runner.os }}-build-${{ env.cache-name }}
24-
restore-keys: |
25-
${{ runner.os }}-build-${{ env.cache-name }}-
26-
${{ runner.os }}-build-
27-
${{ runner.os }}-
28-
29-
- name: Set up JDK 8
16+
- name: Set up Java
3017
uses: actions/setup-java@v2
3118
with:
3219
java-version: '8'
3320
distribution: 'zulu'
21+
cache: 'maven'
3422
- name: Set up CI environment
3523
run: .github/setup.sh
3624
- name: Execute the build

.github/workflows/build-pr.yml

+2-14
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,12 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v2
14-
15-
- name: Cache m2 folder
16-
uses: actions/cache@v2
17-
env:
18-
cache-name: cache-m2
19-
with:
20-
path: ~/.m2/repository
21-
key: ${{ runner.os }}-build-${{ env.cache-name }}
22-
restore-keys: |
23-
${{ runner.os }}-build-${{ env.cache-name }}-
24-
${{ runner.os }}-build-
25-
${{ runner.os }}-
26-
27-
- name: Set up JDK 8
14+
- name: Set up Java
2815
uses: actions/setup-java@v2
2916
with:
3017
java-version: '8'
3118
distribution: 'zulu'
19+
cache: 'maven'
3220
- name: Set up CI environment
3321
run: .github/setup.sh
3422
- name: Execute the build

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[![](https://github.com/imagej/ImageJ/actions/workflows/build-main.yml/badge.svg)](https://github.com/imagej/ImageJ/actions/workflows/build-main.yml)
2+
13
# ImageJ
24

35
ImageJ is [public domain] software for processing and analyzing scientific

0 commit comments

Comments
 (0)