Skip to content

Commit

Permalink
Bump github.com/containers/storage from v1.38.3 to v1.38.5
Browse files Browse the repository at this point in the history
Update github.com/containers/storage from v1.38.3 to v1.38.5.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
  • Loading branch information
nalind committed Jun 30, 2022
1 parent c1bdaba commit a7cfa7e
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 24 deletions.
26 changes: 8 additions & 18 deletions .cirrus.yml
Expand Up @@ -6,7 +6,7 @@ env:
#### Global variables used for all tasks
####
# Name of the ultimate destination branch for this CI run, PR or post-merge.
DEST_BRANCH: "main"
DEST_BRANCH: "release-1.24"
GOPATH: "/var/tmp/go"
GOSRC: "${GOPATH}/src/github.com/containers/buildah"
# Overrides default location (/tmp/cirrus) for repo clone
Expand Down Expand Up @@ -57,7 +57,6 @@ gce_instance:
disk: 200 # Gigabytes, do not set less than 200 per obscure GCE docs re: I/O performance
image_name: "${FEDORA_CACHE_IMAGE_NAME}"


# Update metadata on VM images referenced by this repository state
meta_task:
name: "VM img. keepalive"
Expand Down Expand Up @@ -88,21 +87,12 @@ smoke_task:
alias: 'smoke'
name: "Smoke Test"

gce_instance:
memory: "12Gb"

# N/B: Skip running this on branches due to multiple bugs in
# the git-validate tool which are difficult to debug and fix.
skip: $CIRRUS_PR == ''

timeout_in: 30m

setup_script: '${SCRIPT_BASE}/setup.sh |& ${_TIMESTAMP}'
build_script: '${SCRIPT_BASE}/build.sh |& ${_TIMESTAMP}'
validate_test_script: '${SCRIPT_BASE}/test.sh validate |& ${_TIMESTAMP}'

binary_artifacts:
path: ./bin/*
path: "./bin/*"

# Check that all included go modules from other sources match
# # what is expected in `vendor/modules.txt` vs `go.mod`.
Expand Down Expand Up @@ -143,10 +133,10 @@ cross_build_task:
- brew install go-md2man
- brew install gpgme
- go version
- make cross CGO_ENABLED=0
- make cross

binary_artifacts:
path: ./bin/*
path: "./bin/*"


unit_task:
Expand All @@ -171,7 +161,7 @@ unit_task:
unit_test_script: '${SCRIPT_BASE}/test.sh unit |& ${_TIMESTAMP}'

binary_artifacts:
path: ./bin/*
path: "./bin/*"


conformance_task:
Expand Down Expand Up @@ -238,7 +228,7 @@ integration_task:
integration_test_script: '${SCRIPT_BASE}/test.sh integration |& ${_TIMESTAMP}'

binary_artifacts:
path: ./bin/*
path: "./bin/*"

always: &standardlogs
audit_log_script: '$GOSRC/$SCRIPT_BASE/logcollector.sh audit'
Expand Down Expand Up @@ -269,7 +259,7 @@ in_podman_task:
integration_test_script: '${SCRIPT_BASE}/test.sh integration |& ${_TIMESTAMP}'

binary_artifacts:
path: ./bin/*
path: "./bin/*"

always:
<<: *standardlogs
Expand All @@ -283,8 +273,8 @@ success_task:
alias: success

depends_on:
- meta
- smoke
- meta
- unit
- conformance
- vendor
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -8,7 +8,7 @@ require (
github.com/containers/common v0.47.5
github.com/containers/image/v5 v5.19.3
github.com/containers/ocicrypt v1.1.4
github.com/containers/storage v1.38.3
github.com/containers/storage v1.38.5
github.com/docker/distribution v2.8.0+incompatible
github.com/docker/docker v20.10.12+incompatible
github.com/docker/go-units v0.4.0
Expand Down
3 changes: 2 additions & 1 deletion go.sum
Expand Up @@ -293,8 +293,9 @@ github.com/containers/ocicrypt v1.1.4 h1:V0ktirShnF1iJ2ithuoYE4eNAOSL3af1PlTiykv
github.com/containers/ocicrypt v1.1.4/go.mod h1:xpdkbVAuaH3WzbEabUd5yDsl9SwJA5pABH85425Es2g=
github.com/containers/storage v1.37.0/go.mod h1:kqeJeS0b7DO2ZT1nVWs0XufrmPFbgV3c+Q/45RlH6r4=
github.com/containers/storage v1.38.2/go.mod h1:INP0RPLHWBxx+pTsO5uiHlDUGHDFvWZPWprAbAlQWPQ=
github.com/containers/storage v1.38.3 h1:GP1JU51sgwuqEu4+Lp8taBsqbkHgHVqzb/uzqZF9HOc=
github.com/containers/storage v1.38.3/go.mod h1:INP0RPLHWBxx+pTsO5uiHlDUGHDFvWZPWprAbAlQWPQ=
github.com/containers/storage v1.38.5 h1:gymwFRLMvFAqiGcDJ0+OxaN6ZqQkv3FQSbhN7a2JBW0=
github.com/containers/storage v1.38.5/go.mod h1:INP0RPLHWBxx+pTsO5uiHlDUGHDFvWZPWprAbAlQWPQ=
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=
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/containers/storage/VERSION

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/storage/drivers/chown_unix.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 23 additions & 1 deletion vendor/github.com/containers/storage/drivers/driver_linux.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Expand Up @@ -164,7 +164,7 @@ github.com/containers/ocicrypt/keywrap/pkcs7
github.com/containers/ocicrypt/spec
github.com/containers/ocicrypt/utils
github.com/containers/ocicrypt/utils/keyprovider
# github.com/containers/storage v1.38.3
# github.com/containers/storage v1.38.5
github.com/containers/storage
github.com/containers/storage/drivers
github.com/containers/storage/drivers/aufs
Expand Down

0 comments on commit a7cfa7e

Please sign in to comment.