Merge pull request #26 from k1LoW/benchmarck-same-runner

Run 2 benchmarks on same runner

.github/workflows/benchmark.yml

@@ -0,0 +1,51 @@
+name: benchmark
+
+on:
+  pull_request:
+
+jobs:
+  benchmark:
+    name: Benchmark
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Check out source code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: go.mod
+
+      - name: Check out source code (main)
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          path: main
+
+      - name: Set up deps
+        run: make depsdev
+
+      - name: Run benchmark (main)
+        run: make benchmark
+        working-directory: main
+
+      - name: Run octocov (main)
+        uses: k1LoW/octocov-action@v0
+        with:
+          config: .octocov.benchmark.main.yml
+        env:
+          OCTOCOV_GITHUB_REF: refs/heads/main
+          OCTOCOV_GITHUB_SHA: none
+          OCTOCOV_CUSTOM_METRICS_BENCHMARK: main/custom_metrics_benchmark.json
+
+      - name: Run benchmark
+        run: make benchmark
+
+      - name: Run octocov
+        uses: k1LoW/octocov-action@v0
+        with:
+          config: .octocov.benchmark.yml
+        env:
+          OCTOCOV_CUSTOM_METRICS_BENCHMARK: custom_metrics_benchmark.json

.github/workflows/ci.yml

@@ -35,10 +35,5 @@ jobs:
       - name: Run tests
         run: make ci
 
-      - name: Run benchmark
-        run: make benchmark
-
       - name: Run octocov
         uses: k1LoW/octocov-action@v0
-        env:
-          OCTOCOV_CUSTOM_METRICS_BENCHMARK: custom_metrics_benchmark.json

.octocov.benchmark.main.yml

@@ -0,0 +1,10 @@
+repository: ${GITHUB_REPOSITORY}/benchmark
+coverage:
+  if: false
+codeToTestRatio:
+  if: false
+testExecutionTime:
+  if: false
+report:
+  datastores:
+    - local://main

.octocov.benchmark.yml

@@ -0,0 +1,14 @@
+repository: ${GITHUB_REPOSITORY}/benchmark
+coverage:
+  if: false
+codeToTestRatio:
+  if: false
+testExecutionTime:
+  if: false
+diff:
+  datastores:
+    - local://main
+comment:
+  if: is_pull_request
+summary:
+  if: true

rp_test.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"net/http/httputil"
 	"net/url"
 	"os"
 	"testing"
@@ -192,7 +193,8 @@ func TestHTTPSRouting(t *testing.T) {
 				return
 			}
 			if tt.wantErr {
-				t.Error("want error")
+				b, _ := httputil.DumpResponse(resp, true)
+				t.Errorf("want error, got resp:\n%s", string(b))
 				return
 			}
 			defer resp.Body.Close()