From 4264c7d3a8a9ec18a88160a625043f0c93b54f06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Aug 2021 08:30:57 +0000 Subject: [PATCH] build(deps): bump github.com/containers/storage from 1.33.1 to 1.33.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.33.1 to 1.33.2. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/main/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.33.1...v1.33.2) --- updated-dependencies: - dependency-name: github.com/containers/storage dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: Daniel J Walsh Signed-off-by: Miloslav Trmač --- .cirrus.yml | 6 +++--- Makefile | 4 ++-- go.mod | 4 ++-- go.sum | 8 ++++---- hack/validate.sh | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 8809c399..10d69502 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -98,10 +98,10 @@ test_task: matrix: - name: "Test" env: - BUILDTAGS: 'btrfs_noversion libdm_no_deferred_remove' + BUILDTAGS: 'btrfs_noversion libdm_no_deferred_remove no_libsubid' - name: "Test w/ opengpg" env: - BUILDTAGS: &withopengpg 'btrfs_noversion libdm_no_deferred_remove containers_image_openpgp' + BUILDTAGS: &withopengpg 'btrfs_noversion libdm_no_deferred_remove containers_image_openpgp no_libsubid' script: | make tools make test BUILDTAGS="$BUILDTAGS" @@ -129,7 +129,7 @@ test_skopeo_task: matrix: - name: "Skopeo Test" env: - BUILDTAGS: 'btrfs_noversion libdm_no_deferred_remove' + BUILDTAGS: 'btrfs_noversion libdm_no_deferred_remove no_libsubid' - name: "Skopeo Test w/ opengpg" env: BUILDTAGS: *withopengpg diff --git a/Makefile b/Makefile index fff342bf..8042e12e 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ endif BUILD_TAGS_WINDOWS_CROSS = containers_image_openpgp BUILD_TAGS_DARWIN_CROSS = containers_image_openpgp -BUILDTAGS = btrfs_noversion libdm_no_deferred_remove +BUILDTAGS = btrfs_noversion libdm_no_deferred_remove no_libsubid BUILDFLAGS := -tags "$(BUILDTAGS)" PACKAGES := $(shell GO111MODULE=on go list $(BUILDFLAGS) ./...) @@ -87,7 +87,7 @@ fmt: @gofmt -l -s -w $(SOURCE_DIRS) validate: lint - @hack/validate.sh + @BUILDTAGS="$(BUILDTAGS)" hack/validate.sh lint: $(GOBIN)/golangci-lint run --build-tags "$(BUILDTAGS)" diff --git a/go.mod b/go.mod index 3ae8b533..2fc0a4da 100644 --- a/go.mod +++ b/go.mod @@ -4,10 +4,10 @@ go 1.13 require ( github.com/14rcole/gopopulate v0.0.0-20180821133914-b175b219e774 // indirect - github.com/BurntSushi/toml v0.3.1 + github.com/BurntSushi/toml v0.4.1 github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b github.com/containers/ocicrypt v1.1.2 - github.com/containers/storage v1.33.1 + github.com/containers/storage v1.33.2 github.com/docker/distribution v2.7.1+incompatible github.com/docker/docker v20.10.8+incompatible github.com/docker/docker-credential-helpers v0.6.4 diff --git a/go.sum b/go.sum index 29dc9241..cbc3d5aa 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,9 @@ github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935 github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw= +github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= @@ -203,8 +204,8 @@ github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgU github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= github.com/containers/ocicrypt v1.1.2 h1:Ez+GAMP/4GLix5Ywo/fL7O0nY771gsBIigiqUm1aXz0= github.com/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= -github.com/containers/storage v1.33.1 h1:RHUPZ7vQxwoeOoMoKUDsVun4f9Wi8BTXmr/wQiruBYU= -github.com/containers/storage v1.33.1/go.mod h1:FUZPF4nJijX8ixdhByZJXf02cvbyLi6dyDwXdIe8QVY= +github.com/containers/storage v1.33.2 h1:HmUfQ33ArH7LA7TdJbaKwcGoVheCGxv80H/4DYUTFhM= +github.com/containers/storage v1.33.2/go.mod h1:t6I+hTgPU0/tVxQ75vw406wDi/TXwYBqZp4QZV9N7b8= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= @@ -426,7 +427,6 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.3 h1:BtAvtV1+h0YwSVwWoYXMREPpYu9VzTJ9QDI1TEg/iQQ= github.com/klauspost/compress v1.13.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= diff --git a/hack/validate.sh b/hack/validate.sh index 465939a4..078d34ff 100755 --- a/hack/validate.sh +++ b/hack/validate.sh @@ -15,7 +15,7 @@ if [[ -z $(type -P gofmt) ]]; then fi echo "Executing go vet" -GO111MODULE="on" go vet ./... +GO111MODULE="on" go vet -tags="$BUILDTAGS" ./... echo "Executing gofmt" OUTPUT=$(gofmt -s -l . | sed -e '/^vendor/d')