Skip to content

Commit 70db5a7

Browse files
scottfscottf
committed
fix actions
1 parent 9d4b766 commit 70db5a7

File tree

4 files changed

+119
-47
lines changed

4 files changed

+119
-47
lines changed

‎.github/workflows/build-main.yml‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,41 @@ jobs:
1515
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
1616
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
1717
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
18-
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
1918
steps:
20-
- name: Setup JDK 8
21-
uses: actions/setup-java@v3
19+
- name: Setup JDK
20+
uses: actions/setup-java@v4
2221
with:
23-
java-version: '8'
24-
distribution: 'adopt'
22+
java-version: '21'
23+
distribution: 'temurin'
24+
- name: Setup Gradle
25+
uses: gradle/actions/setup-gradle@v4
26+
with:
27+
gradle-version: '8.14' # Quotes required to prevent YAML converting to number
28+
- name: Setup GO
29+
uses: actions/setup-go@v5
30+
with:
31+
go-version: stable
2532
- name: Install Nats Server
2633
run: |
27-
curl -sf https://binaries.nats.dev/nats-io/nats-server/v2@main | PREFIX=. sh
28-
sudo mv nats-server /usr/local/bin
34+
pkill -9 nats-server 2>/dev/null || true
35+
mkdir -p ~/.local/bin
36+
cd $GITHUB_WORKSPACE
37+
git clone https://github.com/nats-io/nats-server.git
38+
cd nats-server
39+
go build -o ~/.local/bin/nats-server
2940
nats-server -v
3041
- name: Check out code
31-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
3243
- name: Build and Test
33-
run: chmod +x gradlew && ./gradlew clean test jacocoTestReport coveralls
44+
run: chmod +x gradlew && ./gradlew clean test jacocoTestReport
3445
- name: Verify Javadoc
3546
run: ./gradlew javadoc
36-
- name: Verify and Publish Snapshot
47+
- name: Send coverage to Coveralls
48+
uses: coverallsapp/github-action@v2
49+
with:
50+
github-token: ${{ secrets.COVERALLS_REPO_TOKEN }}
51+
- name: Publish Snapshot
3752
run: ./gradlew -i publishToSonatype
53+
- name: Clean up
54+
if: always()
55+
run: pkill -9 nats-server 2>/dev/null || true

‎.github/workflows/build-pr.yml‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,38 @@ jobs:
1111
BUILD_EVENT: ${{ github.event_name }}
1212
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
1313
steps:
14-
- name: Setup JDK 8
15-
uses: actions/setup-java@v3
14+
- name: Setup JDK
15+
uses: actions/setup-java@v5
1616
with:
17-
java-version: '8'
18-
distribution: 'adopt'
17+
java-version: '21'
18+
distribution: 'temurin'
19+
- name: Setup Gradle
20+
uses: gradle/actions/setup-gradle@v4
21+
with:
22+
gradle-version: '8.14' # Quotes required to prevent YAML converting to number
23+
- name: Setup GO
24+
uses: actions/setup-go@v5
25+
with:
26+
go-version: stable
1927
- name: Install Nats Server
2028
run: |
21-
curl -sf https://binaries.nats.dev/nats-io/nats-server/v2@main | PREFIX=. sh
22-
sudo mv nats-server /usr/local/bin
29+
pkill -9 nats-server 2>/dev/null || true
30+
mkdir -p ~/.local/bin
31+
cd $GITHUB_WORKSPACE
32+
git clone https://github.com/nats-io/nats-server.git
33+
cd nats-server
34+
go build -o ~/.local/bin/nats-server
2335
nats-server -v
2436
- name: Check out code
25-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
2638
- name: Build and Test
27-
run: chmod +x gradlew && ./gradlew clean test jacocoTestReport coveralls
39+
run: chmod +x gradlew && ./gradlew clean test jacocoTestReport
2840
- name: Verify Javadoc
2941
run: ./gradlew javadoc
42+
- name: Send coverage to Coveralls
43+
uses: coverallsapp/github-action@v2
44+
with:
45+
github-token: ${{ secrets.COVERALLS_REPO_TOKEN }}
46+
- name: Clean up
47+
if: always()
48+
run: pkill -9 nats-server 2>/dev/null || true

‎.github/workflows/build-release.yml‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,35 @@ jobs:
1717
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
1818
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
1919
steps:
20-
- name: Setup JDK 8
21-
uses: actions/setup-java@v3
20+
- name: Setup JDK
21+
uses: actions/setup-java@v4
2222
with:
23-
java-version: '8'
24-
distribution: 'adopt'
23+
java-version: '21'
24+
distribution: 'temurin'
25+
- name: Setup Gradle
26+
uses: gradle/actions/setup-gradle@v4
27+
with:
28+
gradle-version: '8.14' # Quotes required to prevent YAML converting to number
29+
- name: Setup GO
30+
uses: actions/setup-go@v5
31+
with:
32+
go-version: stable
2533
- name: Install Nats Server
2634
run: |
27-
curl -sf https://binaries.nats.dev/nats-io/nats-server/v2@main | PREFIX=. sh
28-
sudo mv nats-server /usr/local/bin
35+
pkill -9 nats-server 2>/dev/null || true
36+
mkdir -p ~/.local/bin
37+
cd $GITHUB_WORKSPACE
38+
git clone https://github.com/nats-io/nats-server.git
39+
cd nats-server
40+
go build -o ~/.local/bin/nats-server
2941
nats-server -v
3042
- name: Check out code
31-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
3244
- name: Build and Test
3345
run: chmod +x gradlew && ./gradlew clean test
34-
- name: Verify Javadoc
35-
run: ./gradlew javadoc
3646
- name: Verify, Sign and Publish Release
37-
run: ./gradlew -i signArchives signMavenJavaPublication publishToSonatype closeAndReleaseSonatypeStagingRepository
47+
run: ./gradlew -i publishToSonatype closeAndReleaseSonatypeStagingRepository
48+
- name: Clean up
49+
if: always()
50+
run: pkill -9 nats-server 2>/dev/null || true
51+

‎build.gradle‎

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import aQute.bnd.gradle.Bundle
2+
13
plugins {
24
id("java")
35
id("java-library")
@@ -12,7 +14,6 @@ plugins {
1214
def jarVersion = "2.1.0"
1315
group = 'io.nats'
1416

15-
def isMerge = System.getenv("BUILD_EVENT") == "push"
1617
def isRelease = System.getenv("BUILD_EVENT") == "release"
1718

1819
// version is the variable the build actually uses.
@@ -25,16 +26,44 @@ java {
2526

2627
repositories {
2728
mavenCentral()
28-
maven { url="https://oss.sonatype.org/content/repositories/releases/" }
29+
maven { url="https://repo1.maven.org/maven2/" }
30+
maven { url="https://central.sonatype.com/repository/maven-snapshots/" }
2931
}
3032

3133
dependencies {
32-
testImplementation 'org.junit.jupiter:junit-jupiter:5.7.0'
33-
testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.12.3'
34+
testImplementation 'org.junit.jupiter:junit-jupiter:5.14.1'
35+
testImplementation 'nl.jqno.equalsverifier:equalsverifier:4.2.1'
36+
37+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
38+
}
39+
40+
tasks.register('bundle', Bundle) {
41+
from sourceSets.main.output
42+
}
43+
44+
jar {
45+
bundle {
46+
bnd("Bundle-Name": "io.nats.jnats.server.runner",
47+
"Bundle-Vendor": "nats.io",
48+
"Bundle-Description": "NATS.IO Java Server Runner",
49+
"Bundle-DocURL": "https://github.com/nats-io/java-nats-server-runner"
50+
)
51+
}
3452
}
3553

3654
test {
3755
useJUnitPlatform()
56+
testLogging {
57+
exceptionFormat = 'full'
58+
events "started", "passed", "skipped", "failed"
59+
showStandardStreams = true
60+
}
61+
retry {
62+
failOnPassedAfterRetry = false
63+
maxFailures = 4
64+
maxRetries = 4
65+
}
66+
systemProperty 'junit.jupiter.execution.timeout.default', '3m'
3867
}
3968

4069
javadoc {
@@ -67,23 +96,15 @@ jacocoTestReport {
6796
xml.required = true // coveralls plugin depends on xml format report
6897
html.required = true
6998
}
70-
afterEvaluate { // only report on main library not examples
71-
classDirectories.setFrom(files(classDirectories.files.collect {
72-
fileTree(dir: it,
73-
exclude: ['**/examples**'])
74-
}))
75-
}
7699
}
77100

78-
if (isMerge || isRelease) {
79-
nexusPublishing {
80-
repositories {
81-
sonatype {
82-
nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
83-
snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
84-
username = System.getenv('OSSRH_USERNAME')
85-
password = System.getenv('OSSRH_PASSWORD')
86-
}
101+
nexusPublishing {
102+
repositories {
103+
sonatype {
104+
nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
105+
snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
106+
username = System.getenv('OSSRH_USERNAME')
107+
password = System.getenv('OSSRH_PASSWORD')
87108
}
88109
}
89110
}

0 commit comments

Comments
 (0)