From 8094492a67da362592c273d86c9aaec0f43d40b0 Mon Sep 17 00:00:00 2001 From: Felix Furrer Date: Sat, 17 Apr 2021 22:21:03 +0200 Subject: [PATCH] Update dependencies --- .github/workflows/ci.yml | 6 +++--- .github/workflows/release.yml | 8 ++++---- .github/workflows/shiftleft.yml | 6 +++--- build/package/Dockerfile.alpine | 4 ++-- build/package/goreleaser.yml | 1 - go.mod | 2 +- go.sum | 2 -- test/semver_alpine_container_test.yml | 4 ++-- test/semver_container_test.yml | 4 ++-- 9 files changed, 17 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c7e4fb..efcd29a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,9 @@ on: - main env: - GO_VERSION: 1.15 - TASK_VERSION: 3.2.1 - GORELEASER_VERSION: 0.154.0 + GO_VERSION: 1.16 + TASK_VERSION: 3.3.0 + GORELEASER_VERSION: 0.162.0 jobs: build: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5fd592c..ec4e754 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,14 +4,14 @@ name: Release on: push: tags: - - '*.*.*' + - 'v*.*.*' env: - GO_VERSION: 1.15 - GORELEASER_VERSION: 0.154.0 + GO_VERSION: 1.16 + GORELEASER_VERSION: 0.162.0 jobs: - create-release: + release: name: Create release runs-on: ubuntu-20.04 steps: diff --git a/.github/workflows/shiftleft.yml b/.github/workflows/shiftleft.yml index dc0cd3a..c2d367b 100644 --- a/.github/workflows/shiftleft.yml +++ b/.github/workflows/shiftleft.yml @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -name: shiftleft +name: ShiftLeft on: push: @@ -11,8 +11,8 @@ on: - '.gitignore' env: - GO_VERSION: 1.15 - TASK_VERSION: 3.2.1 + GO_VERSION: 1.16 + TASK_VERSION: 3.2.2 jobs: shiftleft: diff --git a/build/package/Dockerfile.alpine b/build/package/Dockerfile.alpine index b5b865d..230aa79 100644 --- a/build/package/Dockerfile.alpine +++ b/build/package/Dockerfile.alpine @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT -# docker.io/library/alpine:3.12.3 -FROM alpine@sha256:3c7497bf0c7af93428242d6176e8f7905f2201d8fc5861f45be7a346b5f23436 +# docker.io/library/alpine:3.13.5 +FROM alpine@sha256:827525365ff718681b0688621e09912af49a17611701ee4d421ba50d57c13f7e COPY semver /usr/local/bin/ diff --git a/build/package/goreleaser.yml b/build/package/goreleaser.yml index d61d49e..9737de4 100644 --- a/build/package/goreleaser.yml +++ b/build/package/goreleaser.yml @@ -129,7 +129,6 @@ dist: artifacts/dist before: hooks: - - go mod download - go mod verify - go test -v -mod readonly ./... diff --git a/go.mod b/go.mod index 88abcd1..4eff8e4 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT module github.com/ffurrer2/semver -go 1.15 +go 1.16 require ( github.com/onsi/ginkgo v1.16.1 diff --git a/go.sum b/go.sum index 9610dcf..dc877ca 100644 --- a/go.sum +++ b/go.sum @@ -69,7 +69,6 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -301,7 +300,6 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= diff --git a/test/semver_alpine_container_test.yml b/test/semver_alpine_container_test.yml index 451eadf..f020166 100644 --- a/test/semver_alpine_container_test.yml +++ b/test/semver_alpine_container_test.yml @@ -11,7 +11,7 @@ commandTests: args: [ 'version' ] expectedOutput: - |- - semver version (0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))? + semver version v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))? commit: [a-f0-9]{40} built at: \d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(\.\d+)?(([+-]\d\d:\d\d)|Z)? exitCode: 0 @@ -50,7 +50,7 @@ metadataTest: - key: 'org.opencontainers.image.vendor' value: 'Felix Furrer' - key: 'org.opencontainers.image.version' - value: '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$' + value: '^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$' isRegex: true entrypoint: [ 'semver' ] cmd: [ 'help' ] diff --git a/test/semver_container_test.yml b/test/semver_container_test.yml index 45c353a..2dbe916 100644 --- a/test/semver_container_test.yml +++ b/test/semver_container_test.yml @@ -11,7 +11,7 @@ commandTests: args: [ 'version' ] expectedOutput: - |- - semver version (0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))? + semver version v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))? commit: [a-f0-9]{40} built at: \d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(\.\d+)?(([+-]\d\d:\d\d)|Z)? exitCode: 0 @@ -50,7 +50,7 @@ metadataTest: - key: 'org.opencontainers.image.vendor' value: 'Felix Furrer' - key: 'org.opencontainers.image.version' - value: '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$' + value: '^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$' isRegex: true entrypoint: [ '/semver' ] cmd: [ 'help' ]