Make all GH workflows more similar

Makes all common steps on all GH workflows the same.
ifosch · Oct 23, 2022 · f8d4193 · f8d4193
1 parent 7026073
commit f8d4193
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 22 deletions.
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -7,29 +7,34 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
       -
         name: Install Go
         uses: actions/setup-go@v2
         with:
           go-version: '^1.16'
       -
         name: Prepare coverage
+        run: |
+          go install github.com/jandelgado/gcov2lcov@latest
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Prepare coverage report
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CODECLIMATE_TOKEN }}
+          CC_TR_URL: "https://codeclimate.com/downloads/test-reporter"
+          CC_TR_BIN: "test-reporter-latest-linux-amd64"
         run: |
-          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter && \
+          mkdir -p coverage && \
+          curl -L ${CC_TR_URL}/${CC_TR_BIN} > ./cc-test-reporter && \
           chmod +x ./cc-test-reporter && \
           ./cc-test-reporter before-build
       -
         name: Run tests
         run: |
-          go get -u github.com/jandelgado/gcov2lcov && \
-          go test -v ./... -coverprofile=coverage.out -covermode=atomic && \
-          mkdir -p coverage && \
-          gcov2lcov -infile=coverage.out -outfile=coverage/lcov.info
+          go test -v ./... -race -coverprofile=coverage/gcov.out -covermode=atomic && \
+          gcov2lcov -infile=coverage/gcov.out -outfile=coverage/lcov.info
       -
         name: Push coverage
         env:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -7,9 +7,6 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
       -
         name: Install Go
         uses: actions/setup-go@v2
@@ -22,19 +19,27 @@ jobs:
           echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
       -
         name: Prepare coverage
+        run: |
+          go install github.com/jandelgado/gcov2lcov@latest
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Prepare coverage report
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CODECLIMATE_TOKEN }}
+          CC_TR_URL: "https://codeclimate.com/downloads/test-reporter"
+          CC_TR_BIN: "test-reporter-latest-linux-amd64"
         run: |
-          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter && \
+          mkdir -p coverage && \
+          curl -L ${CC_TR_URL}/${CC_TR_BIN} > ./cc-test-reporter && \
           chmod +x ./cc-test-reporter && \
           ./cc-test-reporter before-build
       -
         name: Run tests
         run: |
-          go install github.com/jandelgado/gcov2lcov && \
-          go test -v ./... -coverprofile=coverage.out -covermode=atomic && \
-          mkdir -p coverage && \
-          gcov2lcov -infile=coverage.out -outfile=coverage/lcov.info
+          go test -v ./... -race -coverprofile=coverage/gcov.out -covermode=atomic && \
+          gcov2lcov -infile=coverage/gcov.out -outfile=coverage/lcov.info
       -
         name: Push coverage
         env:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -17,16 +17,21 @@ jobs:
         name: Checkout
         uses: actions/checkout@v2
       -
-        name: Run tests
+        name: Prepare coverage report
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CODECLIMATE_TOKEN }}
+          CC_TR_URL: "https://codeclimate.com/downloads/test-reporter"
+          CC_TR_BIN: "test-reporter-latest-linux-amd64"
         run: |
-          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter && \
-          chmod +x ./cc-test-reporter && \
-          ./cc-test-reporter before-build && \
-          go test -v ./... -race -coverprofile=coverage.out -covermode=atomic && \
           mkdir -p coverage && \
-          gcov2lcov -infile=coverage.out -outfile=coverage/lcov.info
+          curl -L ${CC_TR_URL}/${CC_TR_BIN} > ./cc-test-reporter && \
+          chmod +x ./cc-test-reporter && \
+          ./cc-test-reporter before-build
+      -
+        name: Run tests
+        run: |
+          go test -v ./... -race -coverprofile=coverage/gcov.out -covermode=atomic && \
+          gcov2lcov -infile=coverage/gcov.out -outfile=coverage/lcov.info
       -
         name: Push coverage
         env: