Tweaks

nats-io · Aug 31, 2023 · 986efbb · 986efbb
1 parent 1c42e5a
commit 986efbb
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 77 deletions.
diff --git a/.github/workflows/test-generic.yaml b/.github/workflows/test-generic.yaml
@@ -3,7 +3,7 @@ name: General Tests
 on: [push]
 
 env:
-  GO_VERSION: "^1.19.10"
+  GO_VERSION: "^1.21"
 
 jobs:
   lint:
@@ -19,11 +19,8 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - name: Install GolangCI Lint
-        run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
-
-      - name: Run GolangCI Lint
-        run: golangci-lint run
+      - name: Run linter
+        uses: golangci/golangci-lint-action@v3
 
   build:
     name: Build
@@ -40,8 +37,5 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - name: Install Deps
-        run: go mod download
-
-      - name: Build
+      - name: Build NATS Server
         run: go build
diff --git a/.github/workflows/test-linux.yaml b/.github/workflows/test-linux.yaml
@@ -3,33 +3,11 @@ name: Linux Tests
 on: [push]
 
 env:
-  GO_VERSION: "^1.19.10"
+  GO_VERSION: "^1.21"
 
 jobs:
-  no-race:
-    name: No Race Tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - name: Install Deps
-        run: go mod download
-
-      - name: Run Tests
-        run: |-
-          go test -v -p=1 \
-            -run=TestNoRace \
-            ./... \
-            -count=1 -vet=off -timeout=30m -failfast
-
   js-no-cluster:
-    name: JetStream - No Cluster
+    name: JetStream tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -40,10 +18,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - name: Install Deps
-        run: go mod download
-
-      - name: Run Tests
+      - name: Run unit tests
         run: |-
           go test -race -v \
             -run=TestJetStream \
@@ -52,7 +27,7 @@ jobs:
             -count=1 -vet=off -timeout=30m -failfast
 
   js-cluster-1:
-    name: JetStream Cluster - Test 1
+    name: JetStream cluster tests (1)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -63,10 +38,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - name: Install Deps
-        run: go mod download
-
-      - name: Run Tests
+      - name: Run unit tests
         run: |-
           go test -race -v \
             -run=TestJetStreamCluster \
@@ -75,7 +47,7 @@ jobs:
             -count=1 -vet=off -timeout=30m -failfast
 
   js-cluster-2:
-    name: JetStream Cluster - Test 2
+    name: JetStream cluster tests (2)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -86,10 +58,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - name: Install Deps
-        run: go mod download
-
-      - name: Run Tests
+      - name: Run unit tests
         run: |-
           go test -race -v \
             -run=TestJetStreamCluster \
@@ -98,7 +67,7 @@ jobs:
             -count=1 -vet=off -timeout=30m -failfast
 
   js-cluster-3:
-    name: JetStream Cluster - Test 3
+    name: JetStream cluster tests (3)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -109,10 +78,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - name: Install Deps
-        run: go mod download
-
-      - name: Run Tests
+      - name: Run unit tests
         run: |-
           go test -race -v \
             -run=TestJetStreamCluster \
@@ -121,7 +87,7 @@ jobs:
             -count=1 -vet=off -timeout=30m -failfast
 
   js-supercluster:
-    name: JetStream Supercluster
+    name: JetStream supercluster tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -135,15 +101,15 @@ jobs:
       - name: Install Deps
         run: go mod download
 
-      - name: Run Tests
+      - name: Run unit tests
         run: |-
           go test -race -v \
             -run=TestJetStreamSuperCluster \
             ./server/... \
             -count=1 -vet=off -timeout=30m -failfast
 
-  js-chaos:
-    name: JetStream Chaos
+  no-race:
+    name: No-race tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -154,10 +120,26 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - name: Install Deps
-        run: go mod download
+      - name: Run unit tests
+        run: |-
+          go test -v -p=1 \
+            -run=TestNoRace \
+            ./... \
+            -count=1 -vet=off -timeout=30m -failfast
+
+  js-chaos:
+    name: JetStream chaos tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ env.GO_VERSION }}
 
-      - name: Run Tests
+      - name: Run unit tests
         run: |-
           go test -race -v -p=1 \
             -run=TestJetStreamChaos \
@@ -166,7 +148,7 @@ jobs:
             -count=1 -vet=off -timeout=30m -failfast
 
   mqtt:
-    name: MQTT
+    name: MQTT tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -177,18 +159,15 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - name: Install Deps
-        run: go mod download
-
-      - name: Run Tests
+      - name: Run unit tests
         run: |-
           go test -race -v \
             -run=TestMQTT \
             ./server/... \
             -count=1 -vet=off -timeout=30m -failfast
 
   server-pkg-non-js:
-    name: Server Package - Non-JS
+    name: Non-JetStream/MQTT tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -199,18 +178,15 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - name: Install Deps
-        run: go mod download
-
-      - name: Run Tests
+      - name: Run unit tests
         run: |-
           go test -race -v -p=1 \
             ./server/... \
             -tags=skip_js_tests,skip_mqtt_tests \
             -count=1 -vet=off -timeout=30m -failfast
 
   non-server-pkg:
-    name: Non-Server Package
+    name: Tests from all other packages
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -221,10 +197,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - name: Install Deps
-        run: go mod download
-
-      - name: Run Tests
+      - name: Run unit tests
         run: |-
           go test -race -v -p=1 \
             ./conf/... \

diff --git a/.github/workflows/test-windows-2019.yaml b/.github/workflows/test-windows-2019.yaml
@@ -3,7 +3,7 @@ name: Windows Server 2019 - Tests
 on: [push]
 
 env:
-  GO_VERSION: "^1.19.10"
+  GO_VERSION: "^1.21"
 
 jobs:
   js-no-cluster:

diff --git a/.github/workflows/test-windows-2022.yaml b/.github/workflows/test-windows-2022.yaml
@@ -3,7 +3,7 @@ name: Windows Server 2022 - Tests
 on: [push]
 
 env:
-  GO_VERSION: "^1.19.10"
+  GO_VERSION: "^1.21"
 
 jobs:
   js-no-cluster: