Skip to content

Commit 0327604

Browse files
authored
Merge pull request #21 from essentialkaos/develop
Improve CI workflow
2 parents 27c63ac + c65df88 commit 0327604

File tree

4 files changed

+22
-41
lines changed

4 files changed

+22
-41
lines changed

.github/workflows/ci.yml

+17-36
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818

1919
env:
2020
SRC_DIR: src/github.com/${{ github.repository }}
21-
GO111MODULE: auto
2221

2322
strategy:
2423
matrix:
@@ -29,13 +28,6 @@ jobs:
2928
uses: actions/setup-go@v3
3029
with:
3130
go-version: ${{ matrix.go }}
32-
id: go
33-
34-
- name: Setup PATH
35-
run: |
36-
echo "GOPATH=${{ github.workspace }}" >> "$GITHUB_ENV"
37-
echo "GOBIN=${{ github.workspace }}/bin" >> "$GITHUB_ENV"
38-
echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
3931

4032
- name: Checkout
4133
uses: actions/checkout@v3
@@ -50,33 +42,29 @@ jobs:
5042
working-directory: ${{env.SRC_DIR}}
5143
run: go test -covermode=count -coverprofile=cover.out
5244

53-
- name: Install goveralls
54-
env:
55-
GO111MODULE: off
56-
run: go get -v github.com/mattn/goveralls
57-
58-
- name: Send coverage to Coveralls
59-
working-directory: ${{env.SRC_DIR}}
45+
- name: Send coverage data
46+
uses: essentialkaos/goveralls-action@v1
6047
env:
6148
COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
62-
run: goveralls -service github -coverprofile cover.out
63-
64-
- name: Set up Node.js
65-
uses: actions/setup-node@v3
6649
with:
67-
node-version: '14.x'
50+
path: ${{env.SRC_DIR}}
51+
profile: cover.out
52+
parallel: true
53+
flag-name: linux-${{ matrix.go }}
6854

69-
- name: Install codeclimate-test-reporter
70-
run: npm install -g codeclimate-test-reporter
55+
SendCoverage:
56+
name: Send Coverage
57+
runs-on: ubuntu-latest
7158

72-
- name: Send coverage to Codebeat
73-
working-directory: ${{env.SRC_DIR}}
59+
needs: Go
60+
61+
steps:
62+
- name: Finish parallel tests
63+
uses: essentialkaos/goveralls-action@v1
7464
env:
75-
CODECLIMATE_API_HOST: https://codebeat.co/webhooks/code_coverage
76-
CODECLIMATE_REPO_TOKEN: ${{ secrets.CODECLIMATE_TOKEN }}
77-
run: |
78-
sed -i'.original' 's#/v[0-9]\+/#/#g' cover.out
79-
codeclimate-test-reporter < cover.out
65+
COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
66+
with:
67+
parallel-finished: true
8068

8169
Aligo:
8270
name: Aligo
@@ -86,20 +74,13 @@ jobs:
8674

8775
env:
8876
SRC_DIR: src/github.com/${{ github.repository }}
89-
GO111MODULE: auto
9077

9178
steps:
9279
- name: Set up Go
9380
uses: actions/setup-go@v3
9481
with:
9582
go-version: '1.17.x'
96-
id: go
9783

98-
- name: Setup PATH
99-
run: |
100-
echo "GOPATH=${{ github.workspace }}" >> "$GITHUB_ENV"
101-
echo "GOBIN=${{ github.workspace }}/bin" >> "$GITHUB_ENV"
102-
echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
10384
- name: Checkout
10485
uses: actions/checkout@v3
10586
with:

.github/workflows/codeql.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525
fetch-depth: 2
2626

2727
- name: Initialize CodeQL
28-
uses: github/codeql-action/init@v1
28+
uses: github/codeql-action/init@v2
2929
with:
3030
languages: go
3131

3232
- name: Perform CodeQL Analysis
33-
uses: github/codeql-action/analyze@v1
33+
uses: github/codeql-action/analyze@v2

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/essentialkaos/go-zabbix
22

33
go 1.17
44

5-
require github.com/essentialkaos/check v1.2.1
5+
require github.com/essentialkaos/check v1.3.0
66

77
require (
88
github.com/kr/pretty v0.3.0 // indirect

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
2-
github.com/essentialkaos/check v1.2.1 h1:avvyFy/1acUNwfxwuOLsHeCjfXtMygtbu0lVDr3nxFs=
3-
github.com/essentialkaos/check v1.2.1/go.mod h1:PhxzfJWlf5L/skuyhzBLIvjMB5Xu9TIyDIsqpY5MvB8=
2+
github.com/essentialkaos/check v1.3.0 h1:ria+8o22RCLdt2D/1SHQsEH5Mmy5S+iWHaGHrrbPUc0=
3+
github.com/essentialkaos/check v1.3.0/go.mod h1:PhxzfJWlf5L/skuyhzBLIvjMB5Xu9TIyDIsqpY5MvB8=
44
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
55
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
66
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=

0 commit comments

Comments
 (0)