Skip to content

Commit 642e11a

Browse files
committed
clean up
1 parent 6841748 commit 642e11a

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

.github/workflows/test_and_build.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Install Go
15-
uses: actions/setup-go@v1
15+
uses: actions/setup-go@v3
1616
with:
1717
go-version: 1.18
1818
- name: Checkout code
@@ -21,10 +21,6 @@ jobs:
2121
uses: golangci/golangci-lint-action@v3
2222
with:
2323
version: v1.46.2
24-
- name: Run linters
25-
run: |
26-
export PATH=$PATH:$(go env GOPATH)/bin
27-
./pre-commit
2824

2925
test:
3026
runs-on: ubuntu-latest
@@ -34,7 +30,7 @@ jobs:
3430
steps:
3531
- name: Install Go
3632
if: success()
37-
uses: actions/setup-go@v1
33+
uses: actions/setup-go@v3
3834
with:
3935
go-version: ${{ matrix.goversion }}
4036
- name: Checkout code
@@ -51,12 +47,9 @@ jobs:
5147
buildversion: [1.12, 1.13, 1.14, 1.15, 1.16, 1.17, 1.18]
5248
testversion: [1.12, 1.13, 1.14, 1.15, 1.16, 1.17, 1.18]
5349
steps:
54-
- name: List Go Versions
55-
run: |
56-
ls -l /opt/hostedtoolcache/go/ || true
5750
- name: Install Go
5851
if: success()
59-
uses: actions/setup-go@v1
52+
uses: actions/setup-go@v3
6053
with:
6154
go-version: ${{ matrix.buildversion }}
6255
- name: Checkout code
@@ -73,23 +66,21 @@ jobs:
7366
- name: Integration test
7467
run: |
7568
go version
76-
ls -l /opt/hostedtoolcache/go/
7769
make inttest
7870
7971
build:
8072
runs-on: ubuntu-latest
8173
needs: [lint, test, inttest]
8274
steps:
75+
- name: Checkout code
76+
uses: actions/checkout@v2
8377
- name: Install Go
8478
uses: actions/setup-go@v3
8579
with:
8680
go-version: 1.18
87-
- name: Checkout code
88-
uses: actions/checkout@v2
8981
- name: build
9082
run: |
9183
go version
92-
export GO111MODULE=on
9384
make build-linux
9485
make build-windows
9586
make build-darwin

go.mod

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
module github.com/jandelgado/gcov2lcov
22

3-
go 1.18
3+
go 1.12
44

55
require github.com/stretchr/testify v1.4.0
6-
7-
require (
8-
github.com/davecgh/go-spew v1.1.0 // indirect
9-
github.com/pmezard/go-difflib v1.0.0 // indirect
10-
gopkg.in/yaml.v2 v2.2.2 // indirect
11-
)

0 commit comments

Comments
 (0)