added static option to set server, harden build (#16)

Author: scottf

.github/workflows/build.yml renamed to .github/workflows/build-merge-or-release.yml

@@ -1,8 +1,6 @@
-name: GitHub Build Actions For Nats Server Runner
+name: GitHub Merge Or Release Build Actions For Nats Server Runner
 
 on:
-  pull_request:
-    types: [opened, synchronize, edited, reopened]
   push:
     branches:
       - main
@@ -46,8 +44,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Build and Test
         run: chmod +x gradlew && ./gradlew clean test
-      - name: On Pull Request, Verify Javadoc
-        if: ${{ success() && github.event_name == 'pull_request' }}
+      - name: Verify Javadoc
         run: ./gradlew javadoc
       - name: On Merge to Main, Verify and Publish Snapshot
         if: ${{ success() && github.event_name == 'push' }}

.github/workflows/build-pr.yml

@@ -0,0 +1,38 @@
+name: GitHub PR Build Actions For Nats Server Runner
+
+on:
+  pull_request:
+    types: [opened, synchronize, edited, reopened]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      BUILD_EVENT: ${{ github.event_name }}
+    steps:
+      - name: Setup JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+      - name: Setup GO
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16.3
+      - name: Install Nats Server
+        run: |
+          cd $GITHUB_WORKSPACE
+          git clone https://github.com/nats-io/nats-server.git
+          cd nats-server
+          go build main.go
+          mkdir -p ~/.local/bin
+          cp main ~/.local/bin/nats-server
+          cd ..
+          rm -rf nats-server
+          nats-server -v
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Build and Test
+        run: chmod +x gradlew && ./gradlew clean test
+      - name: Verify Javadoc
+        run: ./gradlew javadoc

build.gradle

@@ -8,10 +8,9 @@ plugins {
     id 'signing'
 }
 
-def jarVersion = "1.0.7"
+def jarVersion = "1.0.8"
 group = 'io.nats'
 
-def isPr = System.getenv("BUILD_EVENT") == "pull_request"
 def isMerge = System.getenv("BUILD_EVENT") == "push"
 def isRelease = System.getenv("BUILD_EVENT") == "release"
 
@@ -74,11 +73,13 @@ artifacts {
     archives javadocJar, sourcesJar
 }
 
-nexusPublishing {
-    repositories {
-        sonatype {
-            username = System.getenv('OSSRH_USERNAME')
-            password = System.getenv('OSSRH_PASSWORD')
+if (isMerge || isRelease) {
+    nexusPublishing {
+        repositories {
+            sonatype {
+                username = System.getenv('OSSRH_USERNAME')
+                password = System.getenv('OSSRH_PASSWORD')
+            }
         }
     }
 }

src/main/java/nats/io/NatsRunnerUtils.java

@@ -32,6 +32,7 @@ public class NatsRunnerUtils {
     public static final String PORT_REGEX = "port: (\\d+)";
     public static final String PORT_PROPERTY = "port: ";
 
+    private static String SERVER_PATH = null;
 
     /**
      * Build a standard nats://localhost:port uri
@@ -42,6 +43,18 @@ public static String getURIForPort(int port) {
         return "nats://localhost:" + port;
     }
 
+    /**
+     * Set the path for the
+     * @param serverPath
+     */
+    public static void setServerPath(String serverPath) {
+        SERVER_PATH = serverPath;
+    }
+
+    public static void clearServerPath() {
+        SERVER_PATH = null;
+    }
+
     /**
      * Get a port number automatically allocated by the system, typically from an ephemeral port range.
      * @return the port number
@@ -67,13 +80,13 @@ public static int nextPort() throws IOException {
     public static String getNatsServerVersionString() {
         ArrayList<String> cmd = new ArrayList<String>();
 
-        String server_path = System.getenv(NATS_SERVER_PATH_ENV);
-
-        if(server_path == null){
-            server_path = DEFAULT_NATS_SERVER;
+        // order of precedence is environment, value set statically, default
+        String serverPath = System.getenv(NATS_SERVER_PATH_ENV);
+        if (serverPath == null){
+            serverPath = SERVER_PATH == null ? DEFAULT_NATS_SERVER : SERVER_PATH;
         }
 
-        cmd.add(server_path);
+        cmd.add(serverPath);
         cmd.add(VERSION_OPTION);
 
         try {