diff --git a/testing/sops/APKBUILD b/testing/sops/APKBUILD index 5aa125d9a3b..50bc13a5045 100644 --- a/testing/sops/APKBUILD +++ b/testing/sops/APKBUILD @@ -11,12 +11,13 @@ makedepends="go" source="https://github.com/mozilla/sops/archive/v$pkgver/sops-$pkgver.tar.gz skip-hcvault-tests.patch skip-pgp-tests.patch + fix-tests.patch " builddir="$srcdir/sops-$pkgver" options="net" # for downloading Go modules export GOPATH="$srcdir" -export GOFLAGS="-trimpath -modcacherw" +export GOFLAGS="$GOFLAGS -trimpath -modcacherw" export CGO_ENABLED=0 build() { @@ -36,4 +37,5 @@ sha512sums=" 1a62626967f7d1948311e8571be55dc8c46b2914cba0e7716cfba8e0af1034e3f7f4f8ecff036a7aba276aa1c2627787c4e93a66ae207da367809924c11b950e sops-3.7.2.tar.gz e1e718955e40e392a6faa12706107375a524e40636e684f096a51e115eca356b6c22f1922e9b758dae1b4978f36c89a6e6030ac680f79a65c4ac68218b4cdc84 skip-hcvault-tests.patch 9f1861a3e6c9fa5435a12d4052ef7c841fd58a15b75c3b4ab74e181185925970f69822c831252df1e2e44a673f88f220371d27392efd99c24e21e6cb5768778e skip-pgp-tests.patch +3746f8db0342917324afe046a87677c44ac764b3162c18c9505f7f547e641fb04b4f28ebebeef2a78928bcd1df014c0d620e0ff57341355b300caa681d736927 fix-tests.patch " diff --git a/testing/sops/fix-tests.patch b/testing/sops/fix-tests.patch new file mode 100644 index 00000000000..70863b80e0a --- /dev/null +++ b/testing/sops/fix-tests.patch @@ -0,0 +1,17 @@ +--- a/pgp/keysource_test.go ++++ b/pgp/keysource_test.go +@@ -15,12 +15,12 @@ + return true + } + if err := key.Encrypt(x); err != nil { +- t.Errorf("Failed to encrypt: %#v err: %w", x, err) ++ t.Errorf("Failed to encrypt: %#v err: %s", x, err) + return false + } + k, err := key.Decrypt() + if err != nil { +- t.Errorf("Failed to decrypt: %#v err: %w", x, err) ++ t.Errorf("Failed to decrypt: %#v err: %s", x, err) + return false + } + return bytes.Equal(x, k)