diff --git a/.circleci/config.yml b/.circleci/config.yml index 36beac6..8f7b351 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ defaults: &defaults working_directory: /go/src/moul.io/sshportal docker: - - image: circleci/golang:1.15.2 + - image: circleci/golang:1.15.6 environment: GO111MODULE: "on" diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..96d0d69 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,20 @@ +version: 2 +updates: +- package-ecosystem: docker + directory: "/" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 +- package-ecosystem: github-actions + directory: "/" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 +- package-ecosystem: gomod + directory: "/" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index caf9c1e..64a985b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: lint - uses: golangci/golangci-lint-action@v0.1.7 + uses: golangci/golangci-lint-action@v2.3.0 with: version: v1.28 github-token: ${{ secrets.GITHUB_TOKEN }} @@ -53,7 +53,7 @@ jobs: uses: actions/setup-go@v2 with: go-version: ${{ matrix.golang }} - - uses: actions/cache@v1 + - uses: actions/cache@v2.1.3 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ matrix.golang }}-${{ hashFiles('**/go.sum') }} @@ -78,7 +78,7 @@ jobs: uses: actions/setup-go@v2 with: go-version: ${{ matrix.golang }} - - uses: actions/cache@v1 + - uses: actions/cache@v2.1.3 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ matrix.golang }}-${{ hashFiles('**/go.sum') }} diff --git a/AUTHORS b/AUTHORS index 6cae3e1..05414b5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,6 +5,7 @@ ahh Alen Masic Alexander Turner bozzo +dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> fossabot ImgBotApp Jean-Louis Férey diff --git a/Dockerfile b/Dockerfile index 8e3ae5c..72717de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # build -FROM golang:1.15.2 as builder +FROM golang:1.15.6 as builder ENV GO111MODULE=on WORKDIR /go/src/moul.io/sshportal COPY go.mod go.sum ./ diff --git a/LICENSE b/LICENSE index 6250c03..86ee754 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2017 Manfred Touron + Copyright 2017-2021 Manfred Touron Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/go.mod b/go.mod index b80f924..c8b2b42 100644 --- a/go.mod +++ b/go.mod @@ -26,11 +26,11 @@ require ( github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect github.com/smartystreets/goconvey v1.6.4 github.com/stretchr/testify v1.4.0 // indirect - github.com/urfave/cli v1.22.4 - golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 + github.com/urfave/cli v1.22.5 + golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f // indirect gopkg.in/gormigrate.v1 v1.6.0 - moul.io/srand v1.6.0 + moul.io/srand v1.6.1 ) go 1.14 diff --git a/go.sum b/go.sum index 9a49076..75c5f51 100644 --- a/go.sum +++ b/go.sum @@ -96,14 +96,14 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA= -github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU= +github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 h1:umElSU9WZirRdgu2yFHY0ayQkEnKiOC1TtM3fWXFnoU= +golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -126,5 +126,5 @@ gopkg.in/gormigrate.v1 v1.6.0 h1:XpYM6RHQPmzwY7Uyu+t+xxMXc86JYFJn4nEc9HzQjsI= gopkg.in/gormigrate.v1 v1.6.0/go.mod h1:Lf00lQrHqfSYWiTtPcyQabsDdM6ejZaMgV0OU6JMSlw= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -moul.io/srand v1.6.0 h1:BnGM96WdZDjKIUJwv4q1rzz+dQvsSxeATTZsfueV1nQ= -moul.io/srand v1.6.0/go.mod h1:P2uaZB+GFstFNo8sEj6/U8FRV1n25kD0LLckFpJ+qvc= +moul.io/srand v1.6.1 h1:SJ335F+54ivLdlH7wH52Rtyv0Ffos6DpsF5wu3ZVMXU= +moul.io/srand v1.6.1/go.mod h1:P2uaZB+GFstFNo8sEj6/U8FRV1n25kD0LLckFpJ+qvc= diff --git a/rules.mk b/rules.mk index 2979d9c..cc1fe61 100644 --- a/rules.mk +++ b/rules.mk @@ -197,7 +197,7 @@ go.bumpdeps: go.fmt: @set -e; for dir in $(GOMOD_DIRS); do ( set -xe; \ cd $$dir; \ - $(GO) run golang.org/x/tools/cmd/goimports -w `go list -f '{{.Dir}}' ./...)` \ + $(GO) run golang.org/x/tools/cmd/goimports -w `go list -f '{{.Dir}}' ./...` \ ); done VERIFY_STEPS += go.depaware-check @@ -207,7 +207,11 @@ TIDY_STEPS += go.tidy LINT_STEPS += go.lint UNITTEST_STEPS += go.unittest FMT_STEPS += go.fmt -GENERATE_STEPS += go.depaware-update + +# FIXME: disabled, because currently slow +# new rule that is manually run sometimes, i.e. `make pre-release` or `make maintenance`. +# alternative: run it each time the go.mod is changed +#GENERATE_STEPS += go.depaware-update endif ##