Skip to content

Commit 15c17db

Browse files
authored
Merge pull request #1395 from nats-io/header-nullability
Header nullability
2 parents 2b38c86 + b9bcaa3 commit 15c17db

File tree

7 files changed

+168
-136
lines changed

7 files changed

+168
-136
lines changed

.github/workflows/branch-snapshot.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,13 @@ jobs:
2828
go-version: '1.21.4'
2929
- name: Install Nats Server
3030
run: |
31+
pkill -9 nats-server 2>/dev/null || true
32+
mkdir -p ~/.local/bin
3133
cd $GITHUB_WORKSPACE
3234
git clone https://github.com/nats-io/nats-server.git
3335
cd nats-server
34-
go get
35-
go build main.go
36-
mkdir -p ~/.local/bin
37-
cp main ~/.local/bin/nats-server
38-
cd ..
39-
rm -rf nats-server
36+
git checkout tags/v2.11.8 -b release
37+
go build -o ~/.local/bin/nats-server
4038
nats-server -v
4139
- name: Check out code
4240
uses: actions/checkout@v4
@@ -48,5 +46,6 @@ jobs:
4846
- name: Publish Branch Snapshot
4947
if: ${{ success() }}
5048
run: ./gradlew -i publishToSonatype
51-
52-
49+
- name: Clean up
50+
if: always()
51+
run: pkill -9 nats-server 2>/dev/null || true

.github/workflows/build-main.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,13 @@ jobs:
3030
go-version: '1.21.4'
3131
- name: Install Nats Server
3232
run: |
33+
pkill -9 nats-server 2>/dev/null || true
34+
mkdir -p ~/.local/bin
3335
cd $GITHUB_WORKSPACE
3436
git clone https://github.com/nats-io/nats-server.git
3537
cd nats-server
36-
go get
37-
go build main.go
38-
mkdir -p ~/.local/bin
39-
cp main ~/.local/bin/nats-server
40-
cd ..
41-
rm -rf nats-server
38+
git checkout tags/v2.11.8 -b release
39+
go build -o ~/.local/bin/nats-server
4240
nats-server -v
4341
- name: Check out code
4442
uses: actions/checkout@v4
@@ -48,3 +46,6 @@ jobs:
4846
run: ./gradlew javadoc
4947
- name: Publish Snapshot
5048
run: ./gradlew -i publishToSonatype
49+
- name: Clean up
50+
if: always()
51+
run: pkill -9 nats-server 2>/dev/null || true

.github/workflows/build-pr.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,20 @@ jobs:
2828
go-version: '1.21.4'
2929
- name: Install Nats Server
3030
run: |
31+
pkill -9 nats-server 2>/dev/null || true
32+
mkdir -p ~/.local/bin
3133
cd $GITHUB_WORKSPACE
3234
git clone https://github.com/nats-io/nats-server.git
3335
cd nats-server
34-
go get
35-
go build main.go
36-
mkdir -p ~/.local/bin
37-
cp main ~/.local/bin/nats-server
38-
cd ..
39-
rm -rf nats-server
36+
git checkout tags/v2.11.8 -b release
37+
go build -o ~/.local/bin/nats-server
4038
nats-server -v
4139
- name: Check out code
4240
uses: actions/checkout@v4
4341
- name: Build and Test
4442
run: chmod +x gradlew && ./gradlew clean test jacocoTestReport coveralls
4543
- name: Verify Javadoc
4644
run: ./gradlew javadoc
45+
- name: Clean up
46+
if: always()
47+
run: pkill -9 nats-server 2>/dev/null || true

.github/workflows/build-release.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,21 @@ jobs:
2929
go-version: '1.21.4'
3030
- name: Install Nats Server
3131
run: |
32+
pkill -9 nats-server 2>/dev/null || true
33+
mkdir -p ~/.local/bin
3234
cd $GITHUB_WORKSPACE
3335
git clone https://github.com/nats-io/nats-server.git
3436
cd nats-server
35-
go get
36-
go build main.go
37-
mkdir -p ~/.local/bin
38-
cp main ~/.local/bin/nats-server
39-
cd ..
40-
rm -rf nats-server
37+
git checkout tags/v2.11.8 -b release
38+
go build -o ~/.local/bin/nats-server
4139
nats-server -v
4240
- name: Check out code
4341
uses: actions/checkout@v4
4442
- name: Build and Test
4543
run: chmod +x gradlew && ./gradlew clean test
4644
- name: Verify, Sign and Publish Release
4745
run: ./gradlew -i signArchives signMavenJavaPublication publishToSonatype closeAndReleaseSonatypeStagingRepository
46+
- name: Clean up
47+
if: always()
48+
run: pkill -9 nats-server 2>/dev/null || true
4849

src/examples/java/io/nats/examples/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ java -cp build/libs/jnats-{major.minor.patch}-SNAPSHOT.jar:build/libs/jnats-{maj
117117
There are a set tls configuration for the server in the test files that can be used to run the NATS server.
118118

119119
```bash
120-
nats-server --conf src/test/resources/tls.conf
120+
nats-server --config src/test/resources/tls.conf
121121
```
122122

123123
As well as one with the verify flag set.
124124

125125
```bash
126-
nats-server --conf src/test/resources/tlsverify.conf
126+
nats-server --config src/test/resources/tlsverify.conf
127127
```
128128

129129
which will require client certificates.

0 commit comments

Comments
 (0)