diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d01b6966..883d0d3b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -30,12 +30,12 @@ jobs: uses: actions/checkout@v3 - name: Build the container image - uses: docker/build-push-action@v3.0.0 + uses: docker/build-push-action@v3.1.0 with: repository: golang-repo-template - name: Push to GitHub Packages - uses: docker/build-push-action@v3.0.0 + uses: docker/build-push-action@v3.1.0 if: github.event_name == 'release' || github.event_name == 'push' with: username: ${{ github.actor }} @@ -66,7 +66,7 @@ jobs: if: | (github.event_name == 'release' || github.event_name == 'push') && contains(steps.check_dockerhub_credentials.outputs.missingsecrets, 'no') - uses: docker/build-push-action@v3.0.0 + uses: docker/build-push-action@v3.1.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 0fa3f26a..5323f080 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -53,7 +53,7 @@ jobs: with: go-version: ${{ matrix.golang }} - name: Cache Go modules - uses: actions/cache@v3.0.4 + uses: actions/cache@v3.0.5 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ matrix.golang }}-v1-${{ hashFiles('**/go.sum') }} @@ -112,7 +112,7 @@ jobs: uses: actions/setup-go@v3 with: go-version: ${{ matrix.golang }} - - uses: actions/cache@v3.0.4 + - uses: actions/cache@v3.0.5 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ matrix.golang }}-v1-${{ hashFiles('**/go.sum') }} @@ -156,7 +156,7 @@ jobs: uses: actions/setup-go@v3 with: go-version: ${{ matrix.golang }} - - uses: actions/cache@v3.0.4 + - uses: actions/cache@v3.0.5 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ matrix.golang }}-v1-${{ hashFiles('**/go.sum') }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 36024c5d..f94084d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: - name: Cache Go modules if: steps.semantic.outputs.new-release-published == 'true' && steps.repoman.outputs.has-go-binary == 'true' - uses: actions/cache@v3.0.4 + uses: actions/cache@v3.0.5 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ matrix.golang }}-v1-${{ hashFiles('**/go.sum') }} diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index ad483187..ac33afd1 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -30,7 +30,7 @@ jobs: env: SCORECARD_READ_TOKEN: ${{ secrets.SCORECARD_READ_TOKEN }} if: env.SCORECARD_READ_TOKEN != null - uses: ossf/scorecard-action@ce330fde6b1a5c9c75b417e7efc510b822a35564 # v1.0.4 + uses: ossf/scorecard-action@34bc6b110eae5d331dde534cd371be23a51be59d # v1.0.4 with: results_file: results.sarif results_format: sarif diff --git a/Dockerfile b/Dockerfile index 12aee969..14e3bd0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG VCS_REF ARG VERSION # build -FROM golang:1.18.3-alpine as builder +FROM golang:1.18.4-alpine as builder RUN apk add --no-cache git gcc musl-dev make ENV GO111MODULE=on WORKDIR /go/src/moul.io/golang-repo-template @@ -14,7 +14,7 @@ COPY . ./ RUN make install # minimalist runtime -FROM alpine:3.16.0 +FROM alpine:3.16.1 LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.name="golang-repo-template" \ org.label-schema.description="" \ diff --git a/go.mod b/go.mod index b597089a..e2561878 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module moul.io/golang-repo-template -go 1.13 +go 1.18 require ( github.com/peterbourgon/ff/v3 v3.1.2 @@ -13,3 +13,14 @@ require ( moul.io/u v1.27.0 moul.io/zapconfig v1.4.0 ) + +require ( + github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.7.0 // indirect + golang.org/x/mod v0.4.2 // indirect + golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect + golang.org/x/tools v0.1.5 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + moul.io/banner v1.0.1 // indirect +) diff --git a/go.sum b/go.sum index be51a692..e1534592 100644 --- a/go.sum +++ b/go.sum @@ -8,11 +8,9 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= github.com/peterbourgon/ff/v3 v3.0.0/go.mod h1:UILIFjRH5a/ar8TjXYLTkIvSvekZqPm5Eb/qbGk6CT0= @@ -97,7 +95,6 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1N golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/tool/lint/package.json b/tool/lint/package.json index 81b1272e..f5344f41 100644 --- a/tool/lint/package.json +++ b/tool/lint/package.json @@ -2,7 +2,7 @@ "dependencies": { "alex": "10.0.0", "markdown-spellcheck": "1.3.1", - "markdownlint-cli": "0.31.1", + "markdownlint-cli": "0.32.1", "remark-cli": "11.0.0", "remark-lint": "9.1.1" }