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:
Miloslav Trmač
2023-11-07 20:25:12 +01:00
parent 71aac2f430
commit ced07a55f4
65 changed files with 1138 additions and 505 deletions

View File

@@ -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: |

View File

@@ -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