From 4e6a09400aee84ef188ecfd08c043e0f92e48e97 Mon Sep 17 00:00:00 2001 From: Byron Ruth Date: Thu, 13 Jul 2023 14:00:38 -0400 Subject: [PATCH 01/12] Bump to Go 1.19.11 Signed-off-by: Byron Ruth --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3f4e2e6e..c16da5b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ vm: language: go go: - - 1.19.10 + - 1.19.11 addons: apt: From b055f675ba0b6331c97fcdedad26927cf3272eab Mon Sep 17 00:00:00 2001 From: Byron Ruth Date: Thu, 13 Jul 2023 15:29:30 -0400 Subject: [PATCH 02/12] Release v2.9.20 --- README.md | 4 ++-- server/const.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 05cd1418..4eeb391c 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,8 @@ If you are interested in contributing to NATS, read about our... [Fossa-Image]: https://app.fossa.io/api/projects/git%2Bgithub.com%2Fnats-io%2Fnats-server.svg?type=shield [Build-Status-Url]: https://travis-ci.com/github/nats-io/nats-server [Build-Status-Image]: https://travis-ci.com/nats-io/nats-server.svg?branch=main -[Release-Url]: https://github.com/nats-io/nats-server/releases/tag/v2.9.19 -[Release-image]: https://img.shields.io/badge/release-v2.9.19-1eb0fc.svg +[Release-Url]: https://github.com/nats-io/nats-server/releases/tag/v2.9.20 +[Release-image]: https://img.shields.io/badge/release-v2.9.20-1eb0fc.svg [Coverage-Url]: https://coveralls.io/r/nats-io/nats-server?branch=main [Coverage-image]: https://coveralls.io/repos/github/nats-io/nats-server/badge.svg?branch=main [ReportCard-Url]: https://goreportcard.com/report/nats-io/nats-server diff --git a/server/const.go b/server/const.go index 10dd7de9..950cb09c 100644 --- a/server/const.go +++ b/server/const.go @@ -41,7 +41,7 @@ var ( const ( // VERSION is the current version for the server. - VERSION = "2.9.20-beta" + VERSION = "2.9.20" // PROTO is the currently supported protocol. // 0 was the original From 63864490a55e03df3ea8e662a0d5857193c39b52 Mon Sep 17 00:00:00 2001 From: Byron Ruth Date: Thu, 13 Jul 2023 16:04:11 -0400 Subject: [PATCH 03/12] Bump v2.9.21-beta Signed-off-by: Byron Ruth --- server/const.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/const.go b/server/const.go index 950cb09c..dfc6e665 100644 --- a/server/const.go +++ b/server/const.go @@ -41,7 +41,7 @@ var ( const ( // VERSION is the current version for the server. - VERSION = "2.9.20" + VERSION = "2.9.21-beta" // PROTO is the currently supported protocol. // 0 was the original From 586717a3c0911b167f0aa9be5348ada91f8863ff Mon Sep 17 00:00:00 2001 From: Neil Twigg Date: Fri, 14 Jul 2023 13:47:30 +0100 Subject: [PATCH 04/12] Remap ports in leaf node tests to hopefully reduce flakes Multiple tests were using the same port numbers and it seems that the NATS Servers were not always shutting down quickly enough, resulting in `listen tcp 127.0.0.1:50554: bind: address already in use` failures. Signed-off-by: Neil Twigg --- server/jetstream_leafnode_test.go | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/server/jetstream_leafnode_test.go b/server/jetstream_leafnode_test.go index abc789a9..f561f785 100644 --- a/server/jetstream_leafnode_test.go +++ b/server/jetstream_leafnode_test.go @@ -298,8 +298,8 @@ jetstream :{ server_name: A cluster: { name: clust1 - listen: 127.0.0.1:50554 - routes=[nats-route://127.0.0.1:50555] + listen: 127.0.0.1:50104 + routes=[nats-route://127.0.0.1:50105] no_advertise: true } ` @@ -327,8 +327,8 @@ jetstream: { server_name: B cluster: { name: clust1 - listen: 127.0.0.1:50555 - routes=[nats-route://127.0.0.1:50554] + listen: 127.0.0.1:50105 + routes=[nats-route://127.0.0.1:50104] no_advertise: true } ` @@ -350,8 +350,8 @@ jetstream: { server_name: LA cluster: { name: clustL - listen: 127.0.0.1:50556 - routes=[nats-route://127.0.0.1:50557] + listen: 127.0.0.1:50106 + routes=[nats-route://127.0.0.1:50107] no_advertise: true } leafnodes:{ @@ -378,8 +378,8 @@ jetstream: { server_name: LB cluster: { name: clustL - listen: 127.0.0.1:50557 - routes=[nats-route://127.0.0.1:50556] + listen: 127.0.0.1:50107 + routes=[nats-route://127.0.0.1:50106] no_advertise: true } leafnodes:{ @@ -568,8 +568,8 @@ jetstream: { %s store_dir: '%s'; max_mem: 50Mb, max_file: 50Mb } server_name: A cluster: { name: clust1 - listen: 127.0.0.1:50554 - routes=[nats-route://127.0.0.1:50555,nats-route://127.0.0.1:50556] + listen: 127.0.0.1:50114 + routes=[nats-route://127.0.0.1:50115,nats-route://127.0.0.1:50116] no_advertise: true } ` @@ -592,8 +592,8 @@ jetstream: { %s store_dir: '%s'; max_mem: 50Mb, max_file: 50Mb } server_name: B cluster: { name: clust1 - listen: 127.0.0.1:50555 - routes=[nats-route://127.0.0.1:50554,nats-route://127.0.0.1:50556] + listen: 127.0.0.1:50115 + routes=[nats-route://127.0.0.1:50114,nats-route://127.0.0.1:50116] no_advertise: true } ` @@ -619,8 +619,8 @@ jetstream: { server_name: C cluster: { name: clust1 - listen: 127.0.0.1:50556 - routes=[nats-route://127.0.0.1:50554,nats-route://127.0.0.1:50555] + listen: 127.0.0.1:50116 + routes=[nats-route://127.0.0.1:50114,nats-route://127.0.0.1:50115] no_advertise: true } ` @@ -741,8 +741,8 @@ jetstream: { max_file: 50Mb } leafnodes:{ - remotes:[{url:nats://a1:a1@127.0.0.1:50555, account: A, credentials: '%s' }, - {url:nats://s1:s1@127.0.0.1:50555, account: SYS, credentials: '%s', deny_imports: foo, deny_exports: bar}] + remotes:[{url:nats://a1:a1@127.0.0.1:50125, account: A, credentials: '%s' }, + {url:nats://s1:s1@127.0.0.1:50125, account: SYS, credentials: '%s', deny_imports: foo, deny_exports: bar}] } ` akp, err := nkeys.CreateAccount() @@ -1052,8 +1052,8 @@ jetstream : { domain: "DHUB", store_dir: '%s', max_mem: 100Mb, max_file: 100Mb } server_name: HUB1 cluster: { name: HUB - listen: 127.0.0.1:50554 - routes=[nats-route://127.0.0.1:50555] + listen: 127.0.0.1:50134 + routes=[nats-route://127.0.0.1:50135] } leafnodes: { listen:127.0.0.1:-1 @@ -1070,8 +1070,8 @@ jetstream : { domain: "DHUB", store_dir: '%s', max_mem: 100Mb, max_file: 100Mb } server_name: HUB2 cluster: { name: HUB - listen: 127.0.0.1:50555 - routes=[nats-route://127.0.0.1:50554] + listen: 127.0.0.1:50135 + routes=[nats-route://127.0.0.1:50134] } leafnodes: { listen:127.0.0.1:-1 @@ -1088,8 +1088,8 @@ jetstream: { domain: "DLEAF", store_dir: '%s', max_mem: 100Mb, max_file: 100Mb } server_name: LEAF1 cluster: { name: LEAF - listen: 127.0.0.1:50556 - routes=[nats-route://127.0.0.1:50557] + listen: 127.0.0.1:50136 + routes=[nats-route://127.0.0.1:50137] } leafnodes: { remotes:[{url:nats://a1:a1@127.0.0.1:%d, account: A},{url:nats://b1:b1@127.0.0.1:%d, account: B}] @@ -1107,8 +1107,8 @@ jetstream: { domain: "DLEAF", store_dir: '%s', max_mem: 100Mb, max_file: 100Mb } server_name: LEAF2 cluster: { name: LEAF - listen: 127.0.0.1:50557 - routes=[nats-route://127.0.0.1:50556] + listen: 127.0.0.1:50137 + routes=[nats-route://127.0.0.1:50136] } leafnodes: { remotes:[{url:nats://a1:a1@127.0.0.1:%d, account: A},{url:nats://b1:b1@127.0.0.1:%d, account: B}] From 81dd129043d533c814173a64bc807488875945ab Mon Sep 17 00:00:00 2001 From: Neil Twigg Date: Fri, 14 Jul 2023 15:08:17 +0100 Subject: [PATCH 05/12] Move assigned ports out of ephemeral range Signed-off-by: Neil Twigg --- server/jetstream_leafnode_test.go | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/server/jetstream_leafnode_test.go b/server/jetstream_leafnode_test.go index f561f785..50982757 100644 --- a/server/jetstream_leafnode_test.go +++ b/server/jetstream_leafnode_test.go @@ -298,8 +298,8 @@ jetstream :{ server_name: A cluster: { name: clust1 - listen: 127.0.0.1:50104 - routes=[nats-route://127.0.0.1:50105] + listen: 127.0.0.1:20104 + routes=[nats-route://127.0.0.1:20105] no_advertise: true } ` @@ -327,8 +327,8 @@ jetstream: { server_name: B cluster: { name: clust1 - listen: 127.0.0.1:50105 - routes=[nats-route://127.0.0.1:50104] + listen: 127.0.0.1:20105 + routes=[nats-route://127.0.0.1:20104] no_advertise: true } ` @@ -350,8 +350,8 @@ jetstream: { server_name: LA cluster: { name: clustL - listen: 127.0.0.1:50106 - routes=[nats-route://127.0.0.1:50107] + listen: 127.0.0.1:20106 + routes=[nats-route://127.0.0.1:20107] no_advertise: true } leafnodes:{ @@ -378,8 +378,8 @@ jetstream: { server_name: LB cluster: { name: clustL - listen: 127.0.0.1:50107 - routes=[nats-route://127.0.0.1:50106] + listen: 127.0.0.1:20107 + routes=[nats-route://127.0.0.1:20106] no_advertise: true } leafnodes:{ @@ -568,8 +568,8 @@ jetstream: { %s store_dir: '%s'; max_mem: 50Mb, max_file: 50Mb } server_name: A cluster: { name: clust1 - listen: 127.0.0.1:50114 - routes=[nats-route://127.0.0.1:50115,nats-route://127.0.0.1:50116] + listen: 127.0.0.1:20114 + routes=[nats-route://127.0.0.1:20115,nats-route://127.0.0.1:20116] no_advertise: true } ` @@ -592,8 +592,8 @@ jetstream: { %s store_dir: '%s'; max_mem: 50Mb, max_file: 50Mb } server_name: B cluster: { name: clust1 - listen: 127.0.0.1:50115 - routes=[nats-route://127.0.0.1:50114,nats-route://127.0.0.1:50116] + listen: 127.0.0.1:20115 + routes=[nats-route://127.0.0.1:20114,nats-route://127.0.0.1:20116] no_advertise: true } ` @@ -619,8 +619,8 @@ jetstream: { server_name: C cluster: { name: clust1 - listen: 127.0.0.1:50116 - routes=[nats-route://127.0.0.1:50114,nats-route://127.0.0.1:50115] + listen: 127.0.0.1:20116 + routes=[nats-route://127.0.0.1:20114,nats-route://127.0.0.1:20115] no_advertise: true } ` @@ -741,8 +741,8 @@ jetstream: { max_file: 50Mb } leafnodes:{ - remotes:[{url:nats://a1:a1@127.0.0.1:50125, account: A, credentials: '%s' }, - {url:nats://s1:s1@127.0.0.1:50125, account: SYS, credentials: '%s', deny_imports: foo, deny_exports: bar}] + remotes:[{url:nats://a1:a1@127.0.0.1:20125, account: A, credentials: '%s' }, + {url:nats://s1:s1@127.0.0.1:20125, account: SYS, credentials: '%s', deny_imports: foo, deny_exports: bar}] } ` akp, err := nkeys.CreateAccount() @@ -1052,8 +1052,8 @@ jetstream : { domain: "DHUB", store_dir: '%s', max_mem: 100Mb, max_file: 100Mb } server_name: HUB1 cluster: { name: HUB - listen: 127.0.0.1:50134 - routes=[nats-route://127.0.0.1:50135] + listen: 127.0.0.1:20134 + routes=[nats-route://127.0.0.1:20135] } leafnodes: { listen:127.0.0.1:-1 @@ -1070,8 +1070,8 @@ jetstream : { domain: "DHUB", store_dir: '%s', max_mem: 100Mb, max_file: 100Mb } server_name: HUB2 cluster: { name: HUB - listen: 127.0.0.1:50135 - routes=[nats-route://127.0.0.1:50134] + listen: 127.0.0.1:20135 + routes=[nats-route://127.0.0.1:20134] } leafnodes: { listen:127.0.0.1:-1 @@ -1088,8 +1088,8 @@ jetstream: { domain: "DLEAF", store_dir: '%s', max_mem: 100Mb, max_file: 100Mb } server_name: LEAF1 cluster: { name: LEAF - listen: 127.0.0.1:50136 - routes=[nats-route://127.0.0.1:50137] + listen: 127.0.0.1:20136 + routes=[nats-route://127.0.0.1:20137] } leafnodes: { remotes:[{url:nats://a1:a1@127.0.0.1:%d, account: A},{url:nats://b1:b1@127.0.0.1:%d, account: B}] @@ -1107,8 +1107,8 @@ jetstream: { domain: "DLEAF", store_dir: '%s', max_mem: 100Mb, max_file: 100Mb } server_name: LEAF2 cluster: { name: LEAF - listen: 127.0.0.1:50137 - routes=[nats-route://127.0.0.1:50136] + listen: 127.0.0.1:20137 + routes=[nats-route://127.0.0.1:20136] } leafnodes: { remotes:[{url:nats://a1:a1@127.0.0.1:%d, account: A},{url:nats://b1:b1@127.0.0.1:%d, account: B}] From 979b265e2685a493107a4412396ce4ef14e3e04f Mon Sep 17 00:00:00 2001 From: Neil Twigg Date: Fri, 14 Jul 2023 16:44:15 +0100 Subject: [PATCH 06/12] Tweak timing in `TestJetStreamClusterDeleteConsumerWhileServerDown` Signed-off-by: Neil Twigg --- server/jetstream_cluster_3_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/jetstream_cluster_3_test.go b/server/jetstream_cluster_3_test.go index c3f7e8fb..4f4fdcf8 100644 --- a/server/jetstream_cluster_3_test.go +++ b/server/jetstream_cluster_3_test.go @@ -356,7 +356,7 @@ func TestJetStreamClusterDeleteConsumerWhileServerDown(t *testing.T) { // Restart. s = c.restartServer(s) - checkFor(t, time.Second, 200*time.Millisecond, func() error { + checkFor(t, time.Second*2, 200*time.Millisecond, func() error { hs := s.healthz(&HealthzOptions{ JSEnabledOnly: false, JSServerOnly: false, From b58204cff7ec11a8ae6194629088763991c910e7 Mon Sep 17 00:00:00 2001 From: Neil Twigg Date: Fri, 14 Jul 2023 16:44:24 +0100 Subject: [PATCH 07/12] Use `checkFor` in `TestJetStreamMsgHeaders` Signed-off-by: Neil Twigg --- server/jetstream_test.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/server/jetstream_test.go b/server/jetstream_test.go index fc8a8bd2..ef8a5789 100644 --- a/server/jetstream_test.go +++ b/server/jetstream_test.go @@ -8703,13 +8703,16 @@ func TestJetStreamMsgHeaders(t *testing.T) { nc.PublishMsg(m) nc.Flush() - state := mset.state() - if state.Msgs != 1 { - t.Fatalf("Expected 1 message, got %d", state.Msgs) - } - if state.Bytes == 0 { - t.Fatalf("Expected non-zero bytes") - } + checkFor(t, time.Second*2, time.Millisecond*250, func() error { + state := mset.state() + if state.Msgs != 1 { + return fmt.Errorf("Expected 1 message, got %d", state.Msgs) + } + if state.Bytes == 0 { + return fmt.Errorf("Expected non-zero bytes") + } + return nil + }) // Now access raw from stream. sm, err := mset.getMsg(1) From 144abc0dd9d8599027c46961d0ca3bfb50e01d6d Mon Sep 17 00:00:00 2001 From: Neil Twigg Date: Fri, 14 Jul 2023 16:51:51 +0100 Subject: [PATCH 08/12] Make `TestJetStreamAccountImportJSAdvisoriesAsService` insensitive to event order Signed-off-by: Neil Twigg --- server/jetstream_test.go | 47 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/server/jetstream_test.go b/server/jetstream_test.go index ef8a5789..1750d477 100644 --- a/server/jetstream_test.go +++ b/server/jetstream_test.go @@ -10800,38 +10800,37 @@ func TestJetStreamAccountImportJSAdvisoriesAsService(t *testing.T) { if err != nil { t.Fatalf("Unexpected error adding stream: %v", err) } - msg, err := subJS.NextMsg(time.Second) - if err != nil { - t.Fatalf("Unexpected error: %v", err) + + gotEvents := map[string]int{} + for i := 0; i < 2; i++ { + msg, err := subJS.NextMsg(time.Second * 2) + if err != nil { + t.Fatalf("Unexpected error: %v", err) + } + gotEvents[msg.Subject]++ } - if msg.Subject != "$JS.EVENT.ADVISORY.STREAM.CREATED.ORDERS" { - t.Fatalf("Unexpected subject: %q", msg.Subject) + if c := gotEvents["$JS.EVENT.ADVISORY.STREAM.CREATED.ORDERS"]; c != 1 { + t.Fatalf("Should have received one advisory from $JS.EVENT.ADVISORY.STREAM.CREATED.ORDERS but got %d", c) } - msg, err = subJS.NextMsg(time.Second) - if err != nil { - t.Fatalf("Unexpected error: %v", err) - } - if msg.Subject != "$JS.EVENT.ADVISORY.API" { - t.Fatalf("Unexpected subject: %q", msg.Subject) + if c := gotEvents["$JS.EVENT.ADVISORY.API"]; c != 1 { + t.Fatalf("Should have received one advisory from $JS.EVENT.ADVISORY.API but got %d", c) } // same set of events should be received by AGG account // on subjects containing account name (ACC.JS) - msg, err = subAgg.NextMsg(time.Second) - if err != nil { - t.Fatalf("Unexpected error: %v", err) + gotEvents = map[string]int{} + for i := 0; i < 2; i++ { + msg, err := subAgg.NextMsg(time.Second * 2) + if err != nil { + t.Fatalf("Unexpected error: %v", err) + } + gotEvents[msg.Subject]++ } - if msg.Subject != "$JS.EVENT.ADVISORY.ACC.JS.STREAM.CREATED.ORDERS" { - t.Fatalf("Unexpected subject: %q", msg.Subject) + if c := gotEvents["$JS.EVENT.ADVISORY.ACC.JS.STREAM.CREATED.ORDERS"]; c != 1 { + t.Fatalf("Should have received one advisory from $JS.EVENT.ADVISORY.ACC.JS.STREAM.CREATED.ORDERS but got %d", c) } - - // we get error here, since we do not get the api audit event - msg, err = subAgg.NextMsg(time.Second) - if err != nil { - t.Fatalf("Unexpected error: %v", err) - } - if msg.Subject != "$JS.EVENT.ADVISORY.ACC.JS.API" { - t.Fatalf("Unexpected subject: %q", msg.Subject) + if c := gotEvents["$JS.EVENT.ADVISORY.ACC.JS.API"]; c != 1 { + t.Fatalf("Should have received one advisory from $JS.EVENT.ADVISORY.ACC.JS.API but got %d", c) } } From abb47c9554397aa52bb4498caf6187eebd663367 Mon Sep 17 00:00:00 2001 From: Neil Twigg Date: Fri, 14 Jul 2023 16:56:01 +0100 Subject: [PATCH 09/12] Only send one message in `TestJetStreamRedeliverCount` to prevent out-of-order redeliveries Signed-off-by: Neil Twigg --- server/jetstream_test.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/server/jetstream_test.go b/server/jetstream_test.go index 1750d477..be2509e4 100644 --- a/server/jetstream_test.go +++ b/server/jetstream_test.go @@ -5336,13 +5336,15 @@ func TestJetStreamRedeliverCount(t *testing.T) { nc, js := jsClientConnect(t, s) defer nc.Close() - // Send 10 msgs - for i := 0; i < 10; i++ { - js.Publish("DC", []byte("OK!")) - } - if state := mset.state(); state.Msgs != 10 { - t.Fatalf("Expected %d messages, got %d", 10, state.Msgs) + if _, err = js.Publish("DC", []byte("OK!")); err != nil { + t.Fatal(err) } + checkFor(t, time.Second, time.Millisecond*250, func() error { + if state := mset.state(); state.Msgs != 1 { + return fmt.Errorf("Expected %d messages, got %d", 1, state.Msgs) + } + return nil + }) o, err := mset.addConsumer(workerModeConfig("WQ")) if err != nil { From 6cdb0c78382fe0f721e184ad2ef1a3e274e47fdd Mon Sep 17 00:00:00 2001 From: Neil Twigg Date: Fri, 14 Jul 2023 17:03:21 +0100 Subject: [PATCH 10/12] Wait for current in `TestJetStreamClusterStreamUpdateSyncBug` so in-flight state changes aren't lost Signed-off-by: Neil Twigg --- server/jetstream_cluster_2_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/jetstream_cluster_2_test.go b/server/jetstream_cluster_2_test.go index a1c8353b..e927742f 100644 --- a/server/jetstream_cluster_2_test.go +++ b/server/jetstream_cluster_2_test.go @@ -3305,6 +3305,7 @@ func TestJetStreamClusterStreamUpdateSyncBug(t *testing.T) { } // We need to snapshot to force upper layer catchup vs RAFT layer. + c.waitOnAllCurrent() mset, err := c.streamLeader("$G", "TEST").GlobalAccount().lookupStream("TEST") if err != nil { t.Fatalf("Expected to find a stream for %q", "TEST") @@ -3313,6 +3314,7 @@ func TestJetStreamClusterStreamUpdateSyncBug(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } + c.waitOnAllCurrent() nsl = c.restartServer(nsl) c.waitOnStreamCurrent(nsl, "$G", "TEST") From 2527e11304a351d4d925a84e885d80e4d5e392b6 Mon Sep 17 00:00:00 2001 From: Neil Twigg Date: Fri, 14 Jul 2023 17:05:26 +0100 Subject: [PATCH 11/12] Increase threshold in `TestNoRaceJetStreamSlowFilteredInititalPendingAndFirstMsg` Signed-off-by: Neil Twigg --- server/norace_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/norace_test.go b/server/norace_test.go index 1ab99064..c3029a25 100644 --- a/server/norace_test.go +++ b/server/norace_test.go @@ -2424,7 +2424,7 @@ func TestNoRaceJetStreamSlowFilteredInititalPendingAndFirstMsg(t *testing.T) { }) // Threshold for taking too long. - const thresh = 100 * time.Millisecond + const thresh = 150 * time.Millisecond var dindex int testConsumerCreate := func(subj string, startSeq, expectedNumPending uint64) { From 94c1988ed8a4829ea8b3e96632c1f3edc6cc0313 Mon Sep 17 00:00:00 2001 From: Byron Ruth Date: Sat, 15 Jul 2023 07:01:24 -0400 Subject: [PATCH 12/12] Limit branch builds to main and dev Signed-off-by: Byron Ruth --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c16da5b3..c670edc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,23 @@ os: linux dist: focal +branches: + only: + - main + - dev + vm: size: 2x-large language: go go: - 1.19.11 +go_import_path: github.com/nats-io/nats-server addons: apt: packages: - rpm -go_import_path: github.com/nats-io/nats-server jobs: include: