Upgrading to version 0.20.0

3 files changed, 19 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 18d4e575e31b..280284551cc6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skaffold
 	pkgdesc = A command line tool that facilitates continuous development for Kubernetes applications
-	pkgver = 0.19.0
-	pkgrel = 3
+	pkgver = 0.20.0
+	pkgrel = 1
 	url = https://github.com/GoogleContainerTools/skaffold
 	arch = x86_64
 	license = Apache
@@ -10,14 +10,10 @@ pkgbase = skaffold
 	depends = kubectl-bin
 	optdepends = google-cloud-sdk: To use GKE
 	optdepends = minikube: To use Minikube
-	source = skaffold-0.19.0.tar.gz::https://github.com/GoogleContainerTools/skaffold/archive/v0.19.0.tar.gz
+	source = skaffold-0.20.0.tar.gz::https://github.com/GoogleContainerTools/skaffold/archive/v0.20.0.tar.gz
 	source = build_info.patch
-	source = skaffold-0.19.0-index.html::https://storage.googleapis.com/skaffold/releases/v0.19.0/docs/index.html
-	source = skaffold-0.19.0-index.pdf::https://storage.googleapis.com/skaffold/releases/v0.19.0/docs/index.pdf
-	sha256sums = 48fee7f29e6dac4a301d3facf607796b04b7d1ee0b433fd083e3100bf38f7a38
-	sha256sums = af5bd6a9a1e9e2f7d941ffdbd4aebd37e32bb390be03c52a578f3931997f220d
-	sha256sums = 932bb93b9d321d1e3dc974d171cea360a04f2e233d3bc759a32cc34859296285
-	sha256sums = 8645efc4d2da7d6a0aeb23b2bc81d069bfd490e06ff78df82aab13a36e1ab85a
+	sha256sums = 579b4e953f0ae70c93db7111829deb08bee179ecc1430681c9880ce51b21282a
+	sha256sums = 39b1e127a29979ef559e0a92cd721b23d6eac4251c703befd882b8667ac9789e
 
 pkgname = skaffold
 
diff --git a/PKGBUILD b/PKGBUILD
index 999c0dc6f349..23d23bb2442e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,44 +2,37 @@
 # Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
 # Contributor: Stefan Cocora <stefan dot cocora at gmail dot com>
 
-_pkgauthor=GoogleContainerTools
-_commit=9eb0dfc1bf634b97462c66b4dfb80e4cea378ade
 pkgname=skaffold
-pkgver=0.19.0
-pkgrel=3
+pkgver=0.20.0
+pkgrel=1
 pkgdesc="A command line tool that facilitates continuous development for Kubernetes applications"
 arch=("x86_64")
-url="https://github.com/${_pkgauthor}/${pkgname}"
+url="https://github.com/GoogleContainerTools/${pkgname}"
 license=("Apache")
 depends=("docker" "kubectl-bin")
 makedepends=("go-pie")
 optdepends=("google-cloud-sdk: To use GKE"
             "minikube: To use Minikube")
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgauthor}/${pkgname}/archive/v${pkgver}.tar.gz"
-        "build_info.patch"
-        "${pkgname}-${pkgver}-index.html::https://storage.googleapis.com/${pkgname}/releases/v${pkgver}/docs/index.html"
-        "${pkgname}-${pkgver}-index.pdf::https://storage.googleapis.com/${pkgname}/releases/v${pkgver}/docs/index.pdf")
-sha256sums=("48fee7f29e6dac4a301d3facf607796b04b7d1ee0b433fd083e3100bf38f7a38"
-            "af5bd6a9a1e9e2f7d941ffdbd4aebd37e32bb390be03c52a578f3931997f220d"
-            "932bb93b9d321d1e3dc974d171cea360a04f2e233d3bc759a32cc34859296285"
-            "8645efc4d2da7d6a0aeb23b2bc81d069bfd490e06ff78df82aab13a36e1ab85a")
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/GoogleContainerTools/${pkgname}/archive/v${pkgver}.tar.gz"
+        "build_info.patch")
+sha256sums=("579b4e953f0ae70c93db7111829deb08bee179ecc1430681c9880ce51b21282a"
+            "39b1e127a29979ef559e0a92cd721b23d6eac4251c703befd882b8667ac9789e")
+_commit="837e53b260a8fbc35765ed8b5f3c41de6a3242b1"
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/build_info.patch"
 
   rm -rf "${srcdir}/gopath"
-  mkdir -p "${srcdir}/gopath/src/github.com/${_pkgauthor}"
-  ln -rTsf "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/gopath/src/github.com/${_pkgauthor}/${pkgname}"
+  mkdir -p "${srcdir}/gopath/src/github.com/GoogleContainerTools"
+  ln -rTsf "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/gopath/src/github.com/GoogleContainerTools/${pkgname}"
 }
 
 build() {
-  cd "${srcdir}/gopath/src/github.com/${_pkgauthor}/${pkgname}"
+  cd "${srcdir}/gopath/src/github.com/GoogleContainerTools/${pkgname}"
   GOPATH="${srcdir}/gopath" PATH="${PATH}:${GOPATH}/bin" VERSION="v${pkgver}" COMMIT="${_commit}" TREE_STATE="clean" make install
 }
 
 package() {
   install -Dm755 "${srcdir}/gopath/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}-index.html" "${pkgdir}/usr/share/doc/${pkgname}/html/index.html"
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}-index.pdf" "${pkgdir}/usr/share/doc/${pkgname}/pdf/index.pdf"
 }
diff --git a/build_info.patch b/build_info.patch
index 0766af0be500..64e1a735939a 100644
--- a/build_info.patch
+++ b/build_info.patch
@@ -1,13 +1,14 @@
 diff --git a/Makefile b/Makefile
-index f8516e5..4b0a773 100644
+index 68bc2ef..e2918d0 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -33,8 +33,9 @@ SUPPORTED_PLATFORMS := linux-$(GOARCH) darwin-$(GOARCH) windows-$(GOARCH).exe
+@@ -32,9 +32,10 @@ SUPPORTED_PLATFORMS := linux-$(GOARCH) darwin-$(GOARCH) windows-$(GOARCH).exe
  BUILD_PACKAGE = $(REPOPATH)/cmd/skaffold
  
  VERSION_PACKAGE = $(REPOPATH)/pkg/skaffold/version
 -COMMIT = $(shell git rev-parse HEAD)
 +COMMIT ?= $(shell git rev-parse HEAD)
+ BASE_URL ?= https://skaffold.dev
  VERSION ?= $(shell git describe --always --tags --dirty)
 +TREE_STATE ?= $(if $(shell git status --porcelain),dirty,clean)