diff options
-rw-r--r-- | community/git-lfs/APKBUILD | 10 | ||||
-rw-r--r-- | community/git-lfs/fix-test-credentials.patch | 72 | ||||
-rw-r--r-- | community/git-lfs/wait-longer.patch | 44 |
3 files changed, 77 insertions, 49 deletions
diff --git a/community/git-lfs/APKBUILD b/community/git-lfs/APKBUILD index 080d5c5067..ad9555a12f 100644 --- a/community/git-lfs/APKBUILD +++ b/community/git-lfs/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=git-lfs -pkgver=2.3.4 -pkgrel=2 +pkgver=2.4.0 +pkgrel=0 pkgdesc="Git extension for versioning large files" url="https://git-lfs.github.io/" arch="all" @@ -16,7 +16,7 @@ subpackages="$pkgname-doc" install="$pkgname.post-install $pkgname.pre-deinstall" source="$pkgname-$pkgver.tar.gz::https://github.com/git-lfs/$pkgname/archive/v$pkgver.tar.gz fix-test-locks.patch - wait-longer.patch" + fix-test-credentials.patch" builddir="$srcdir/src/github.com/git-lfs/$pkgname" export GOPATH="$srcdir:$builddir" @@ -79,6 +79,6 @@ _gobuild() { go build -tags netcgo -ldflags='-s -w' -v "$@" } -sha512sums="97174dc9346979777c3951baa86cfc07c85e2df04f13a50114e016facbb3fd5fde08d38825493d4e7ff149a13c87ae44e9e40350cd4950f27fe309ef62b6724a git-lfs-2.3.4.tar.gz +sha512sums="1f16d60e54d17bf5829317e95823c4f223510aab3cdd6980e5eac3165bd0b4a98f0cca10fcc43459a42d1c6097f04884fc36bb72ee57c10759d359008fb853a1 git-lfs-2.4.0.tar.gz 66927aa462cb7b5061442e5ffaf7c9e4a5d97179482dc00de3f4abfad5959a9c55df3e88c211067bf15b5b0ea3ef29b249ca32290cc9839280266de5c6854b3f fix-test-locks.patch -408f30bd047dc6bc502c37698615067b6496966e3c0d76e2c36d2eff50d87567aac9b9cbd3bb683566ffdd534a76d7e193ed6338b06c81dc358330de9f7f7903 wait-longer.patch" +f7885b9e668ac9ffcce9d2e447064b4bae970c637f696d1e409b393adcca0d5224bfe95ae57eea0d9db1e194343e3d6ea83fcb9e213c78f9fc834f5afe667021 fix-test-credentials.patch" diff --git a/community/git-lfs/fix-test-credentials.patch b/community/git-lfs/fix-test-credentials.patch new file mode 100644 index 0000000000..5a31c6f1e5 --- /dev/null +++ b/community/git-lfs/fix-test-credentials.patch @@ -0,0 +1,72 @@ +From 458d669a2893d1aa4028a8ce9a44cdabfe3ec6e9 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade <quantum.analyst@gmail.com> +Date: Tue, 6 Mar 2018 19:03:07 -0500 +Subject: [PATCH] Use unique repo name for tests that require credentials. + +Otherwise, when running tests in parallel, they might conflict. +Fixes #2899. + +Patch-Source: https://github.com/git-lfs/git-lfs/pull/2901 +--- + test/cmd/lfstest-gitserver.go | 2 +- + test/test-credentials.sh | 8 ++++---- + test/test-extra-header.sh | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/test/cmd/lfstest-gitserver.go b/test/cmd/lfstest-gitserver.go +index 87a1d4ee..97732995 100644 +--- a/test/cmd/lfstest-gitserver.go ++++ b/test/cmd/lfstest-gitserver.go +@@ -1246,7 +1246,7 @@ func locksHandler(w http.ResponseWriter, r *http.Request, repo string) { + } + + func missingRequiredCreds(w http.ResponseWriter, r *http.Request, repo string) bool { +- if repo != "requirecreds" { ++ if !strings.HasPrefix(repo, "requirecreds") { + return false + } + +diff --git a/test/test-credentials.sh b/test/test-credentials.sh +index 0ebf93a2..3efbe6b5 100755 +--- a/test/test-credentials.sh ++++ b/test/test-credentials.sh +@@ -294,9 +294,9 @@ begin_test "credentials from lfs.url" + ( + set -e + +- reponame="requirecreds" ++ reponame="requirecreds-lfsurl" + setup_remote_repo "$reponame" +- clone_repo "$reponame" requirecreds-lfsurl ++ clone_repo "$reponame" "$reponame" + + git lfs track "*.dat" + echo "push a" > a.dat +@@ -335,9 +335,9 @@ begin_test "credentials from remote.origin.url" + ( + set -e + +- reponame="requirecreds" ++ reponame="requirecreds-remoteurl" + setup_remote_repo "$reponame" +- clone_repo "$reponame" requirecreds-remoteurl ++ clone_repo "$reponame" "$reponame" + + git lfs track "*.dat" + echo "push b" > b.dat +diff --git a/test/test-extra-header.sh b/test/test-extra-header.sh +index 823a7d62..1dbcfe30 100755 +--- a/test/test-extra-header.sh ++++ b/test/test-extra-header.sh +@@ -30,7 +30,7 @@ begin_test "http.<url>.extraHeader with authorization" + ( + set -e + +- reponame="requirecreds" ++ reponame="requirecreds-extraHeader" + setup_remote_repo "$reponame" + clone_repo "$reponame" "$reponame" + +-- +2.14.3 + diff --git a/community/git-lfs/wait-longer.patch b/community/git-lfs/wait-longer.patch deleted file mode 100644 index d593e0063a..0000000000 --- a/community/git-lfs/wait-longer.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit f90446aec14f82d223c22f13efec17752b6ed7bb -Author: Elliott Sales de Andrade <quantum.analyst@gmail.com> -Date: Fri Nov 3 23:27:57 2017 -0400 - - Wait longer for test lfs server to start. - - Also, back off on polling a bit after the first check to reduce any I/O - contention that might slow things down even more. Instead of 5 seconds, - this will wait up to about 60 seconds for files created by the test - server to appear. This allows very slow systems to be able to pass - tests. - - Finally, add a message if the file doesn't appear to make it clear what - went wrong. - -Patch-Source: https://src.fedoraproject.org/rpms/git-lfs/blob/f27/f/wait-longer.patch - -diff --git a/test/testhelpers.sh b/test/testhelpers.sh -index 531d934b..cb31d2ef 100644 ---- a/test/testhelpers.sh -+++ b/test/testhelpers.sh -@@ -258,15 +258,20 @@ size %s - wait_for_file() { - local filename="$1" - n=0 -- while [ $n -lt 10 ]; do -+ wait_time=1 -+ while [ $n -lt 17 ]; do - if [ -s $filename ]; then - return 0 - fi - -- sleep 0.5 -+ sleep $wait_time - n=`expr $n + 1` -+ if [ $wait_time -lt 4 ]; then -+ wait_time=`expr $wait_time \* 2` -+ fi - done - -+ echo "$filename did not appear after 60 seconds." - return 1 - } - |