From 61d9325fe108e8166e3be1a38c41f639a7371346 Mon Sep 17 00:00:00 2001
From: Lev Brouk <lev@synadia.com>
Date: Tue, 5 Dec 2023 13:24:17 -0800
Subject: [PATCH] Simplified GitHub job

---
 .github/workflows/MQTT-test.yaml | 37 +++-----------------------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/MQTT-test.yaml b/.github/workflows/MQTT-test.yaml
index a837f6dc31f..d5676ff73cc 100644
--- a/.github/workflows/MQTT-test.yaml
+++ b/.github/workflows/MQTT-test.yaml
@@ -1,4 +1,4 @@
-name: MQTT-ext 
+name: MQTTEx
 on: [push, pull_request]
 
 jobs:
@@ -23,42 +23,11 @@ jobs:
         run: |
           wget https://github.com/hivemq/mqtt-cli/releases/download/v4.20.0/mqtt-cli-4.20.0.deb
           sudo apt install ./mqtt-cli-4.20.0.deb
-
-      - name: Run 'mqtt test'
-        shell: bash --noprofile --norc -x -eo pipefail {0}
-        run: |
-          cd src/github.com/nats-io/nats-server
-          go test -v -vet=off --run=TestMQTTEx ./server
-
-  bench:
-    strategy:
-      matrix:
-        mode: [Cluster, Server]
-    env:
-      GOPATH: /home/runner/work/nats-server
-      GO111MODULE: "on"
-    
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          path: src/github.com/nats-io/nats-server
-
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.21
-
-      - name: Install external test tools
-        shell: bash --noprofile --norc -x -eo pipefail {0}
-        run: |
           # <>/<> FIXME: use @latest
           go install github.com/ConnectEverything/mqtt-test@36762e7b1c50335f56d9560dda218115e7b475c6
 
-      - name: Run benchmarks
+      - name: Test and benchmark
         shell: bash --noprofile --norc -x -eo pipefail {0}
         run: |
           cd src/github.com/nats-io/nats-server
-          pwd
-          go test --run=- --bench 'MQTTEx/${{ matrix.mode }}' --benchtime=100x ./server | tee /tmp/current-bench-result.txt
+          go test -v --run='MQTTEx' --bench 'MQTTEx' --benchtime=100x ./server | tee /tmp/current-bench-result.txt