Skip to content

Commit 1d3151b

Browse files
committed
Update CI configuration
1 parent f6bd5c8 commit 1d3151b

File tree

5 files changed

+10
-53
lines changed

5 files changed

+10
-53
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-pr.yml

-35
This file was deleted.

.github/workflows/build-main.yml renamed to .github/workflows/build.yml

+7-15
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,22 @@ on:
66
- master
77
tags:
88
- "*-[0-9]+.*"
9+
pull_request:
10+
branches:
11+
- master
912

1013
jobs:
1114
build:
1215
runs-on: ubuntu-latest
1316

1417
steps:
1518
- 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
30-
uses: actions/setup-java@v2
19+
- name: Set up Java
20+
uses: actions/setup-java@v3
3121
with:
3222
java-version: '8'
3323
distribution: 'zulu'
24+
cache: 'maven'
3425
- name: Set up CI environment
3526
run: .github/setup.sh
3627
- name: Execute the build
@@ -40,5 +31,6 @@ jobs:
4031
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
4132
MAVEN_USER: ${{ secrets.MAVEN_USER }}
4233
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
34+
OSSRH_USER: ${{ secrets.OSSRH_USER }}
4335
OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
4436
SIGNING_ASC: ${{ secrets.SIGNING_ASC }}

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![](https://github.com/scijava/scijava-listeners/actions/workflows/build-main.yml/badge.svg)](https://github.com/scijava/scijava-listeners/actions/workflows/build-main.yml)
1+
[![Build Status](https://github.com/scijava/scijava-listeners/actions/workflows/build.yml/badge.svg)](https://github.com/scijava/scijava-listeners/actions/workflows/build.yml)
22

33
# scijava-listeners
44

0 commit comments

Comments
 (0)