Improve mock (#3)

Author: vearutop

.github/workflows/bench.yml

@@ -27,10 +27,10 @@ jobs:
         with:
           path: |
             vendor
-          key: ${{ runner.os }}-go-vendor-${{ hashFiles('**/go.mod') }}
+          key: ${{ runner.os }}-go${{ matrix.go-version }}-vendor-${{ hashFiles('**/go.mod') }}
       - name: Populate dependencies
         run: |
-          (test -d vendor && echo vendor found) || (go mod vendor)
+          (test -d vendor && echo vendor found) || (go mod vendor && du -sh vendor && du -sh ~/go/pkg/mod)
       - name: Restore benchstat
         uses: actions/cache@v2
         with:
@@ -42,7 +42,28 @@ jobs:
           path: |
             bench-master.txt
             bench-main.txt
-          # Using base sha for PR or new commit hash for master/main push in benchmark result key.
+          # Use base sha for PR or new commit hash for master/main push in benchmark result key.
           key: ${{ runner.os }}-bench-${{ (github.event.pull_request.base.sha != github.event.after) && github.event.pull_request.base.sha || github.event.after }}
       - name: Benchmark
-        run: REF_NAME=${GITHUB_REF##*/} make bench
+        id: bench
+        run: |
+          export REF_NAME=${GITHUB_REF##*/}
+          BENCH_COUNT=5 make bench-run bench-stat
+          OUTPUT=$(make bench-stat)
+          OUTPUT="${OUTPUT//'%'/'%25'}"
+          OUTPUT="${OUTPUT//$'\n'/'%0A'}"
+          OUTPUT="${OUTPUT//$'\r'/'%0D'}"
+          echo "::set-output name=result::$OUTPUT"
+      - name: Comment Benchmark Result
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          header: bench
+          message: |
+            ### Benchmark Result
+            <details><summary>Benchmark diff with base branch</summary>
+
+            ```
+            ${{ steps.bench.outputs.result }}
+            ```
+            </details>

.github/workflows/golangci-lint.yml

@@ -17,7 +17,7 @@ jobs:
         uses: golangci/[email protected]
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.32.2
+          version: v1.34.1
 
           # Optional: golangci-lint command line arguments.
           # args: ./the-only-dir-to-analyze/...

.github/workflows/test-unit.yml

@@ -0,0 +1,75 @@
+name: test-unit
+on:
+  push:
+    branches:
+      - master
+      - main
+  pull_request:
+env:
+  GO111MODULE: "on"
+jobs:
+  test:
+    strategy:
+      matrix:
+        go-version: [ 1.13.x, 1.14.x, 1.15.x ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Restore base test coverage
+        uses: actions/cache@v2
+        with:
+          path: |
+            unit-base.txt
+          # Use base sha for PR or new commit hash for master/main push in test result key.
+          key: ${{ runner.os }}-unit-test-coverage-${{ (github.event.pull_request.base.sha != github.event.after) && github.event.pull_request.base.sha || github.event.after }}
+      - name: Restore vendor
+        uses: actions/cache@v2
+        with:
+          path: |
+            vendor
+          key: ${{ runner.os }}-go${{ matrix.go-version }}-vendor-${{ hashFiles('**/go.mod') }}
+      - name: Populate dependencies
+        run: |
+          (test -d vendor && echo vendor found) || (go mod vendor && du -sh vendor && du -sh ~/go/pkg/mod)
+      - name: Test
+        id: test
+        run: |
+          make test-unit
+          go tool cover -func=./unit.coverprofile | sed -e 's/.go:[0-9]*:\t/.go\t/g' | sed -e 's/\t\t*/\t/g'  > unit.txt
+          OUTPUT=$(test -e unit-base.txt && (diff unit-base.txt unit.txt || exit 0) || cat unit.txt)
+          OUTPUT="${OUTPUT//'%'/'%25'}"
+          OUTPUT="${OUTPUT//$'\n'/'%0A'}"
+          OUTPUT="${OUTPUT//$'\r'/'%0D'}"
+          TOTAL=$(grep 'total:' unit.txt)
+          echo "::set-output name=diff::$OUTPUT"
+          echo "::set-output name=total::$TOTAL"
+      - name: Store base coverage
+        if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }}
+        run: cp unit.txt unit-base.txt
+      - name: Comment Test Coverage
+        if: matrix.go-version == '1.15.x'
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          header: unit-test
+          message: |
+            ### Unit Test Coverage
+            ${{ steps.test.outputs.total }}
+            <details><summary>Coverage diff with base branch</summary>
+
+            ```diff
+            ${{ steps.test.outputs.diff }}
+            ```
+            </details>
+
+      - name: Upload code coverage
+        if: matrix.go-version == '1.15.x'
+        uses: codecov/codecov-action@v1
+        with:
+          file: ./unit.coverprofile
+          flags: unittests

.github/workflows/test.yml

@@ -1,5 +1,3 @@
-GOLANGCI_LINT_VERSION := "v1.32.2"
-
 # The head of Makefile determines location of dev-go to include standard targets.
 GO ?= go
 export GO111MODULE = on
@@ -29,11 +27,9 @@ endif
 
 -include $(DEVGO_PATH)/makefiles/main.mk
 -include $(DEVGO_PATH)/makefiles/test-unit.mk
--include $(DEVGO_PATH)/makefiles/lint.mk
 -include $(DEVGO_PATH)/makefiles/bench.mk
+-include $(DEVGO_PATH)/makefiles/lint.mk
 -include $(DEVGO_PATH)/makefiles/github-actions.mk
 
 ## Run tests
 test: test-unit
-
-

Makefile

@@ -3,9 +3,10 @@ module github.com/bool64/stats
 go 1.13
 
 require (
-	github.com/bool64/dev v0.1.8
+	github.com/bool64/dev v0.1.12
 	github.com/kr/pretty v0.2.0 // indirect
-	github.com/prometheus/client_golang v1.7.1
+	github.com/prometheus/client_golang v1.9.0
 	github.com/stretchr/testify v1.5.1
-	gopkg.in/yaml.v2 v2.3.0 // indirect
+	golang.org/x/sys v0.0.0-20210108172913-0df2131ae363 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
 )