mirror of
https://github.com/containers/podman.git
synced 2025-12-01 02:27:13 +08:00
Update c/image and c/common to latest, c/buildah to main
... to include https://github.com/containers/image/pull/2173, https://github.com/containers/common/pull/1731 and https://github.com/containers/buildah/pull/5143 . Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
17
vendor/github.com/containers/luksy/.cirrus.yml
generated
vendored
17
vendor/github.com/containers/luksy/.cirrus.yml
generated
vendored
@@ -9,8 +9,23 @@ docker_builder:
|
||||
apt-get -q install -y bats cryptsetup golang
|
||||
go version
|
||||
make
|
||||
unit_test_script:
|
||||
unit_test_script: |
|
||||
go test -timeout 45m -v -cover
|
||||
case $(go env GOARCH) in
|
||||
amd64)
|
||||
otherarch=386;;
|
||||
arm64)
|
||||
otherarch=arm;;
|
||||
mips64)
|
||||
otherarch=mips;;
|
||||
mips64le)
|
||||
otherarch=mipsle;;
|
||||
esac
|
||||
if test -n "$otherarch" ; then
|
||||
echo running unit tests again with GOARCH=$otherarch
|
||||
GOARCH=$otherarch go test -timeout 45m -v -cover
|
||||
fi
|
||||
:
|
||||
defaults_script: |
|
||||
bats -f defaults ./tests
|
||||
aes_script: |
|
||||
|
||||
2
vendor/github.com/containers/luksy/tune.go
generated
vendored
2
vendor/github.com/containers/luksy/tune.go
generated
vendored
@@ -40,7 +40,7 @@ func memoryCostArgon2(salt []byte, keyLen, timeCost, threadsCost int, kdf func([
|
||||
if d < time.Second/10 {
|
||||
memoryCost *= 2
|
||||
} else {
|
||||
return memoryCost * int(time.Second) / int(d)
|
||||
return memoryCost * int(float64(time.Second)/float64(d))
|
||||
}
|
||||
}
|
||||
return memoryCost
|
||||
|
||||
Reference in New Issue
Block a user