Skip to content

Commit 1668622

Browse files
authored
Merge pull request pact-foundation#309 from YOU54F/v1/golanglint
ci(deps): update golangci-lint ci build to pass on v1.x.x branch
2 parents 88a372a + b99059c commit 1668622

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

.github/workflows/golangci-lint.yml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,35 @@ name: golangci-lint
22
on:
33
push:
44
tags:
5-
- v*
5+
- v1*
66
branches:
7-
- master
8-
- main
7+
- v1.x.x
98
pull_request:
109
jobs:
1110
golangci:
1211
name: lint
13-
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
go-version: [
15+
1.17.x,
16+
1.18.x,
17+
# 1.19.x
18+
]
19+
os: [ubuntu-latest]
20+
runs-on: ${{ matrix.os }}
1421
steps:
15-
- uses: actions/checkout@v2
22+
- name: Checkout code
23+
uses: actions/checkout@v3
24+
- name: Install Go
25+
uses: actions/setup-go@v4
26+
with:
27+
go-version: ${{ matrix.go-version }}
1628
- name: golangci-lint
17-
uses: golangci/golangci-lint-action@v2
29+
uses: golangci/golangci-lint-action@v3
1830
with:
1931
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
20-
version: v1.29
32+
# version: v1.29
33+
version: v1.53
2134

2235
# Optional: working directory, useful for monorepos
2336
# working-directory: somedir

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
runs-on: ${{ matrix.os }}
2323
steps:
2424
- name: Install Go
25-
uses: actions/setup-go@v2
25+
uses: actions/setup-go@v4
2626
with:
2727
go-version: ${{ matrix.go-version }}
2828
- name: Checkout code
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v3
3030
- name: Test
3131
run: GIT_BRANCH=${GIT_REF:11} DOCKER_GATEWAY_HOST=172.17.0.1 DOCKER_HOST_HTTP="http://172.17.0.1" make
3232
- name: Install goveralls

0 commit comments

Comments
 (0)