summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD17
-rw-r--r--build_info.patch13
3 files changed, 17 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3d03297b82a..5f0949ac684 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = skaffold-git
pkgdesc = A command line tool that facilitates continuous development for Kubernetes applications
- pkgver = 1.23.0
+ pkgver = 1.27.0
pkgrel = 1
url = https://github.com/GoogleContainerTools/skaffold
arch = x86_64
@@ -12,10 +12,7 @@ pkgbase = skaffold-git
optdepends = bash-completion: Tab autocompletion
provides = skaffold
conflicts = skaffold
- source = skaffold-1.23.0.tar.gz::https://github.com/GoogleContainerTools/skaffold/archive/v1.23.0.tar.gz
- source = build_info.patch
- sha256sums = 1877bd2e52471e77f03b3b78c4740fb4880f462a3c345f006f9416bfe0f041c9
- sha256sums = c382f4c48e81d0a66cd679bc9d7e76942d1f07718f9ecf134a107bb355cdf193
+ source = skaffold-1.27.0.tar.gz::https://github.com/GoogleContainerTools/skaffold/archive/v1.27.0.tar.gz
+ sha256sums = c82a842d138f75dbab5cbc64f0dda3cce6bfb0c7bba5a6ecfaed0c9799b556b1
pkgname = skaffold-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 5bd1b2ca3e6..a1bcdc79ab8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,17 @@
-# Maintainer: Jerry Y. Chen <jynych3n@gmail.com>
# Maintainer Christian Rebischke <chris.rebischke@archlinux.org>
# Maintainer: Fredy GarcĂ­a <frealgagu at gmail dot com>
# Maintainer: Maxim Baz <${reponame} at maximbaz dot com>
# Contributor: Stefan Cocora <stefan dot cocora at gmail dot com>
+# Maintainer: Jerry Y. Chen <chen@jyny.dev>
pkgname=skaffold-git
-pkgver=1.23.0
-pkgrel=1
-pkgdesc="A command line tool that facilitates continuous development for Kubernetes applications"
-arch=("x86_64")
reponame=skaffold
provides=('skaffold')
conflicts=('skaffold')
+pkgver=1.27.0
+pkgrel=1
+pkgdesc="A command line tool that facilitates continuous development for Kubernetes applications"
+arch=("x86_64")
url="https://github.com/GoogleContainerTools/${reponame}"
license=("Apache")
depends=("docker")
@@ -23,15 +23,12 @@ optdepends=(
)
source=(
"${reponame}-${pkgver}.tar.gz::https://github.com/GoogleContainerTools/${reponame}/archive/v${pkgver}.tar.gz"
- "build_info.patch"
)
-sha256sums=('1877bd2e52471e77f03b3b78c4740fb4880f462a3c345f006f9416bfe0f041c9'
- 'c382f4c48e81d0a66cd679bc9d7e76942d1f07718f9ecf134a107bb355cdf193')
-_commit="e8f3c652112c338e75e03497bc8ab09b9081142d"
+sha256sums=('c82a842d138f75dbab5cbc64f0dda3cce6bfb0c7bba5a6ecfaed0c9799b556b1')
+_commit="1f46f249c832bb2a99e3285ad327647c95ff4bb9"
prepare() {
cd "${srcdir}/${reponame}-${pkgver}"
- patch -Np1 -i "${srcdir}/build_info.patch"
rm -rf "${srcdir}/gopath"
mkdir -p "${srcdir}/gopath/bin"
diff --git a/build_info.patch b/build_info.patch
index cb1af799139..9b587d8219b 100644
--- a/build_info.patch
+++ b/build_info.patch
@@ -1,9 +1,9 @@
diff --git a/Makefile b/Makefile
-index b5c88bd6e..a5c95d273 100644
+index dd22ea0..aa47490 100644
--- a/Makefile
+++ b/Makefile
-@@ -36,7 +36,8 @@ SKAFFOLD_TEST_PACKAGES = ./pkg/skaffold/... ./cmd/... ./hack/... ./pkg/webhook/.
- GO_FILES = $(shell find . -type f -name '*.go' -not -path "./pkg/diag/*")
+@@ -35,7 +35,8 @@ SKAFFOLD_TEST_PACKAGES = ./pkg/skaffold/... ./cmd/... ./hack/... ./pkg/webhook/.
+ GO_FILES = $(shell find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./pkg/diag/*")
VERSION_PACKAGE = $(REPOPATH)/pkg/skaffold/version
-COMMIT = $(shell git rev-parse HEAD)
@@ -11,12 +11,13 @@ index b5c88bd6e..a5c95d273 100644
+TREE_STATE ?= $(if $(shell git status --porcelain),dirty,clean)
ifeq "$(strip $(VERSION))" ""
- override VERSION = $(shell git describe --always --tags --dirty)
-@@ -45,6 +46,7 @@ endif
+ override VERSION = $(shell git describe --always --tags --dirty)
+@@ -52,7 +53,7 @@ GO_BUILD_TAGS_windows = "release"
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)
+-GO_LDFLAGS += -X $(VERSION_PACKAGE).gitTreeState=$(if $(shell git status --porcelain),dirty,clean)
+GO_LDFLAGS += -X $(VERSION_PACKAGE).gitTreeState=$(TREE_STATE)
GO_LDFLAGS += -s -w
- GO_BUILD_TAGS_linux = osusergo netgo static_build release
+ GO_LDFLAGS_windows =" $(GO_LDFLAGS) -extldflags \"$(LDFLAGS_windows)\""