Upgrading to version 0.26.0

3 files changed, 21 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 301ad8148fbc..0cfa9aabd29f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = skaffold
 	pkgdesc = A command line tool that facilitates continuous development for Kubernetes applications
-	pkgver = 0.25.0
+	pkgver = 0.26.0
 	pkgrel = 1
 	url = https://github.com/GoogleContainerTools/skaffold
 	arch = x86_64
@@ -10,10 +10,10 @@ pkgbase = skaffold
 	depends = kubectl
 	optdepends = google-cloud-sdk: To use GKE
 	optdepends = minikube: To use Minikube
-	source = skaffold-0.25.0.tar.gz::https://github.com/GoogleContainerTools/skaffold/archive/v0.25.0.tar.gz
+	source = skaffold-0.26.0.tar.gz::https://github.com/GoogleContainerTools/skaffold/archive/v0.26.0.tar.gz
 	source = build_info.patch
-	sha256sums = ace5322812a6cd6d2fd36ea01ec7330fdfda821ebe88a1ebbcd3cf5c7e7bad35
-	sha256sums = 39b1e127a29979ef559e0a92cd721b23d6eac4251c703befd882b8667ac9789e
+	sha256sums = d4b399480681fab3c1732edf21cb85cc4f60416e101b2e6688063599f7a5ae08
+	sha256sums = 18389d0bb2ed22111c5a99aaf7ffc88b997810df827bf3a308d1441b7a07cd5d
 
 pkgname = skaffold
 
diff --git a/PKGBUILD b/PKGBUILD
index 84a12404a645..a21af1fb1420 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Stefan Cocora <stefan dot cocora at gmail dot com>
 
 pkgname=skaffold
-pkgver=0.25.0
+pkgver=0.26.0
 pkgrel=1
 pkgdesc="A command line tool that facilitates continuous development for Kubernetes applications"
 arch=("x86_64")
@@ -11,13 +11,19 @@ url="https://github.com/GoogleContainerTools/${pkgname}"
 license=("Apache")
 depends=("docker" "kubectl")
 makedepends=("go-pie")
-optdepends=("google-cloud-sdk: To use GKE"
-            "minikube: To use Minikube")
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/GoogleContainerTools/${pkgname}/archive/v${pkgver}.tar.gz"
-        "build_info.patch")
-sha256sums=("ace5322812a6cd6d2fd36ea01ec7330fdfda821ebe88a1ebbcd3cf5c7e7bad35"
-            "39b1e127a29979ef559e0a92cd721b23d6eac4251c703befd882b8667ac9789e")
-_commit="0f4b8fe88969e9fa38346934ea6af7c46772d603"
+optdepends=(
+  "google-cloud-sdk: To use GKE"
+  "minikube: To use Minikube"
+)
+source=(
+  "${pkgname}-${pkgver}.tar.gz::https://github.com/GoogleContainerTools/${pkgname}/archive/v${pkgver}.tar.gz"
+  "build_info.patch"
+)
+sha256sums=(
+  "d4b399480681fab3c1732edf21cb85cc4f60416e101b2e6688063599f7a5ae08"
+  "18389d0bb2ed22111c5a99aaf7ffc88b997810df827bf3a308d1441b7a07cd5d"
+)
+_commit="d88680e9ede62da65500702670ef72fc9272a06f"
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/build_info.patch b/build_info.patch
index 64e1a735939a..4e025e02067c 100644
--- a/build_info.patch
+++ b/build_info.patch
@@ -1,20 +1,19 @@
 diff --git a/Makefile b/Makefile
-index 68bc2ef..e2918d0 100644
+index 290fd85..69490ea 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -32,9 +32,10 @@ SUPPORTED_PLATFORMS := linux-$(GOARCH) darwin-$(GOARCH) windows-$(GOARCH).exe
+@@ -32,8 +32,9 @@ 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)
  
  GO_GCFLAGS := "all=-trimpath=${PWD}"
  GO_ASMFLAGS := "all=-trimpath=${PWD}"
-@@ -44,7 +45,7 @@ GO_LDFLAGS += -extldflags \"${LDFLAGS}\"
+@@ -43,7 +44,7 @@ GO_LDFLAGS += -extldflags \"${LDFLAGS}\"
  GO_LDFLAGS += -X $(VERSION_PACKAGE).version=$(VERSION)
  GO_LDFLAGS += -X $(VERSION_PACKAGE).buildDate=$(shell date +'%Y-%m-%dT%H:%M:%SZ')
  GO_LDFLAGS += -X $(VERSION_PACKAGE).gitCommit=$(COMMIT)