mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-06 13:57:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

community/git-lfs: upgrade to 2.4.1

Browse Source
This commit is contained in:
Jakub Jirutka 2018-05-22 22:44:57 +02:00
parent 7a5e9199e8
commit 19188c1995
2 changed files with 4 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
community/git-lfs/APKBUILD
View File

@ -1,7 +1,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=git-lfs pkgname=git-lfs
pkgver=2.4.0 pkgver=2.4.1
pkgrel=0 pkgrel=0
pkgdesc="Git extension for versioning large files" pkgdesc="Git extension for versioning large files"
url="https://git-lfs.github.io/" url="https://git-lfs.github.io/"
@ -15,8 +15,7 @@ options="!strip"
subpackages="$pkgname-doc" subpackages="$pkgname-doc"
install="$pkgname.post-install $pkgname.pre-deinstall" install="$pkgname.post-install $pkgname.pre-deinstall"
source="$pkgname-$pkgver.tar.gz::https://github.com/git-lfs/$pkgname/archive/v$pkgver.tar.gz source="$pkgname-$pkgver.tar.gz::https://github.com/git-lfs/$pkgname/archive/v$pkgver.tar.gz
fix-test-locks.patch fix-test-locks.patch"
fix-test-credentials.patch"
builddir="$srcdir/src/github.com/git-lfs/$pkgname" builddir="$srcdir/src/github.com/git-lfs/$pkgname"
export GOPATH="$srcdir:$builddir" export GOPATH="$srcdir:$builddir"
@ -79,6 +78,5 @@ _gobuild() {
go build -tags netcgo -ldflags='-s -w' -v "$@" go build -tags netcgo -ldflags='-s -w' -v "$@"
} }
sha512sums="1f16d60e54d17bf5829317e95823c4f223510aab3cdd6980e5eac3165bd0b4a98f0cca10fcc43459a42d1c6097f04884fc36bb72ee57c10759d359008fb853a1 git-lfs-2.4.0.tar.gz sha512sums="c17503ab6ff494dc55ce42eb1cc0cdcf4f7f3315432c2e49a73c24bb6d8407fff09aa05fc0062e311108d225ae2e11139b11b570dcc6f4ece2d6cfecb000afd3 git-lfs-2.4.1.tar.gz
66927aa462cb7b5061442e5ffaf7c9e4a5d97179482dc00de3f4abfad5959a9c55df3e88c211067bf15b5b0ea3ef29b249ca32290cc9839280266de5c6854b3f fix-test-locks.patch 66927aa462cb7b5061442e5ffaf7c9e4a5d97179482dc00de3f4abfad5959a9c55df3e88c211067bf15b5b0ea3ef29b249ca32290cc9839280266de5c6854b3f fix-test-locks.patch"
f7885b9e668ac9ffcce9d2e447064b4bae970c637f696d1e409b393adcca0d5224bfe95ae57eea0d9db1e194343e3d6ea83fcb9e213c78f9fc834f5afe667021 fix-test-credentials.patch"

72
community/git-lfs/fix-test-credentials.patch
View File

@ -1,72 +0,0 @@
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