diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e685dbe8..5ded3ed2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,10 +9,10 @@ jobs: env: GO111MODULE: "on" steps: - - name: Set up Go 1.14 + - name: Set up Go 1.15 uses: actions/setup-go@v1 with: - go-version: 1.14 + go-version: 1.15 id: go - name: Checkout code into the Go module directory @@ -20,7 +20,7 @@ jobs: - name: Run golangci-lint run: | - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b . v1.28.3 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b . v1.30.0 ./golangci-lint run --timeout 10m0s build: @@ -29,10 +29,10 @@ jobs: env: GO111MODULE: "on" steps: - - name: Set up Go 1.14 + - name: Set up Go 1.15 uses: actions/setup-go@v1 with: - go-version: 1.14 + go-version: 1.15 id: go - name: Checkout code into the Go module directory diff --git a/.github/workflows/optional-ci.yml b/.github/workflows/optional-ci.yml index 2cfe9908..c08083a2 100644 --- a/.github/workflows/optional-ci.yml +++ b/.github/workflows/optional-ci.yml @@ -35,10 +35,10 @@ jobs: needs: check-optional-tests if: github.ref == 'refs/heads/main' || needs.check-optional-tests.outputs.trigger-aci == 'true' steps: - - name: Set up Go 1.14 + - name: Set up Go 1.15 uses: actions/setup-go@v1 with: - go-version: 1.14 + go-version: 1.15 id: go - name: Checkout code into the Go module directory @@ -67,10 +67,10 @@ jobs: needs: check-optional-tests if: github.ref == 'refs/heads/main' || needs.check-optional-tests.outputs.trigger-windows == 'true' steps: - - name: Set up Go 1.14 + - name: Set up Go 1.15 uses: actions/setup-go@v1 with: - go-version: 1.14 + go-version: 1.15 id: go - name: Checkout code into the Go module directory diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5a00a876..edea52c0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,10 +8,10 @@ jobs: upload-release: runs-on: ubuntu-latest steps: - - name: Set up Go 1.14 + - name: Set up Go 1.15 uses: actions/setup-go@v1 with: - go-version: 1.14 + go-version: 1.15 id: go - name: Checkout code into the Go module directory diff --git a/Dockerfile b/Dockerfile index 5f5c059c..4c8d90a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -ARG GO_VERSION=1.14.6-alpine -ARG GOLANGCI_LINT_VERSION=v1.29.0-alpine +ARG GO_VERSION=1.15.0-alpine +ARG GOLANGCI_LINT_VERSION=v1.30.0-alpine FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS base WORKDIR /api diff --git a/README.md b/README.md index ec3e95d4..fedae97c 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,11 @@ The recommended way is to use the main `Makefile` that runs everything inside a If you don't have or want to use Docker for building you need to make sure you have all the needed tools installed locally: -* go 1.14 +* go 1.15 * [protoc](https://github.com/protocolbuffers/protobuf) * `go get github.com/golang/protobuf/protoc-gen-go@v1.4.1` * `go get golang.org/x/tools/cmd/goimports` -* `go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.26.0` +* `go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.30.0` And then you can call the same make targets but you need to pass it the `builder.Makefile` (`make -f builder.Makefile`). diff --git a/go.mod b/go.mod index 4ffdb144..56c7cb89 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/docker/api -go 1.14 +go 1.15 // the distribution version from ecs plugin is quite old and it breaks containerd // we need to create a new release tag for docker/distribution