From 48303e6c42a745fc5ab70035fca4da7d91ef25e3 Mon Sep 17 00:00:00 2001 From: francisco souza Date: Tue, 11 Aug 2020 18:29:03 -0400 Subject: [PATCH 1/3] Go 1.15 is out, let's use that in CI Also mark minimal version of go.mod as Go 1.14 since Go 1.13 is gone. --- .github/workflows/main.yml | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a67f6fe6..9d3e743d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,8 +14,8 @@ jobs: strategy: matrix: go_version: - - 1.13 - 1.14 + - 1.15 os: - macos - ubuntu diff --git a/go.mod b/go.mod index e5ab0a2b..fb25265e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fsouza/go-dockerclient -go 1.13 +go 1.14 require ( github.com/Microsoft/go-winio v0.4.15-0.20200113171025-3fe6c5262873 From c175600b797e5871fdcca74d3da1356bfc3a100d Mon Sep 17 00:00:00 2001 From: francisco souza Date: Tue, 11 Aug 2020 23:36:45 -0400 Subject: [PATCH 2/3] workflows/main: use golangci-lint official gh action for linting --- .github/workflows/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d3e743d..fc0d070b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,10 +40,6 @@ jobs: - run: go mod download - - run: make lint - env: - GOFLAGS: -mod=readonly - - run: make gotest env: GOARCH: ${{ matrix.goarch }} @@ -53,3 +49,8 @@ jobs: if: matrix.os != 'macos' && matrix.goarch == 'amd64' env: GOFLAGS: -mod=readonly + + lint: + - uses: actions/checkout@v2.3.1 + + - uses: golangci/golangci-lint-action@v2.2.0 From e6fb651323d764b95e80e11e43c883e38fa819d9 Mon Sep 17 00:00:00 2001 From: francisco souza Date: Tue, 11 Aug 2020 23:37:41 -0400 Subject: [PATCH 3/3] workflows/main: fix lint job --- .github/workflows/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc0d070b..7f9a375f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,6 +51,9 @@ jobs: GOFLAGS: -mod=readonly lint: - - uses: actions/checkout@v2.3.1 + name: lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.1 - - uses: golangci/golangci-lint-action@v2.2.0 + - uses: golangci/golangci-lint-action@v2.2.0