From a07d36079929a162cfefbdce0cefec1c1541292f Mon Sep 17 00:00:00 2001
From: Kevin Daudt <kdaudt@alpinelinux.org>
Date: Mon, 7 Jun 2021 04:48:08 +0000
Subject: [PATCH] testing/cloudfoundry-cli: upgrade to 7.2.0

This has support for go modules, which go 1.16 by default expects.
---
 testing/cloudfoundry-cli/APKBUILD | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/testing/cloudfoundry-cli/APKBUILD b/testing/cloudfoundry-cli/APKBUILD
index e3f1065ae57..a31e8212a5d 100644
--- a/testing/cloudfoundry-cli/APKBUILD
+++ b/testing/cloudfoundry-cli/APKBUILD
@@ -1,28 +1,37 @@
 # Contributor: Thomas Boerger <thomas@webhippie.de>
 # Maintainer: Thomas Boerger <thomas@webhippie.de>
 pkgname=cloudfoundry-cli
-pkgver=6.51.0
-pkgrel=2
+pkgver=7.2.0
+pkgrel=0
 pkgdesc="A CLI for Cloud Foundry written in Go"
 url="https://github.com/cloudfoundry/cli"
 arch="all !s390x !armv7"
 license="Apache-2.0"
 makedepends="go bash"
+checkdepends="ginkgo"
+options="!check" # some tests fail
 source="$pkgname-$pkgver.tar.gz::https://github.com/cloudfoundry/cli/archive/v$pkgver.tar.gz"
 builddir="$srcdir/cli-$pkgver"
 
-build() {
-	mkdir -p src/code.cloudfoundry.org/
-	ln -fs "$builddir" src/code.cloudfoundry.org/cli
+export GOPATH="$srcdir/go"
+export GOCACHE="$srcdir/go-build"
+export GOTEMPDIR="$srcdir/go"
 
-	cd src/code.cloudfoundry.org/cli
-	GOPATH="$builddir" make build
+export GOFLAGS="$GOFLAGS -mod=mod -modcacherw"
+
+build() {
+	make build GOFLAGS="$GOFLAGS"
+}
+
+check() {
+	make test GOFLAGS="$GOFLAGS"
 }
 
 package() {
 	mkdir -p "$pkgdir"/usr/bin
-	install -Dm755 out/cf out/cf6 \
-		"$pkgdir"/usr/bin
+	install -Dm755 out/cf "$pkgdir"/usr/bin/cf
 }
 
-sha512sums="434702d2dc1f1c6727fe7a8a39eb91730d228cf2dfbdf294b68212b1e5cf362032ade26461d2e6951e1eadfc2884a8358f89ec42ddab9c3bb2279a87d3cb6719  cloudfoundry-cli-6.51.0.tar.gz"
+sha512sums="
+9f194460c6ae00666367e60d6053c916ea162946dd198527eddc8dad6c94e0f85816d1000aed9cea825e13674df7c68e90d12be948e30351db4b3b28052bf29d  cloudfoundry-cli-7.2.0.tar.gz
+"