Carl Smedstad pushed to branch main at Arch Linux / Packaging / Packages / helm


Commits:
729813dc by Carl Smedstad at 2024-06-09T18:43:49+02:00
Consistently use 2 space indent

- - - - -
4b2b943c by Carl Smedstad at 2024-06-09T20:06:56+02:00
Document PGP-key identities as comments

- - - - -
fc500cfc by Carl Smedstad at 2024-06-09T20:07:45+02:00
Remove redundant pkgver() function

No longer needed since VCS checksums were implemented.

- - - - -
a4ad7a12 by Carl Smedstad at 2024-06-09T20:08:26+02:00
Run go mod download instead of go mod tidy

- - - - -
7c315329 by Carl Smedstad at 2024-06-09T21:52:15+02:00
Fail check() on test failures

- - - - -
92ea850e by Carl Smedstad at 2024-06-09T21:52:15+02:00
Package fish auto-completions

- - - - -


1 changed file:

- PKGBUILD


Changes:

=====================================
PKGBUILD
=====================================
@@ -15,44 +15,43 @@ depends=('glibc')
 makedepends=("go" "git")
 options=("!lto")
 source=("git+https://github.com/helm/helm.git#tag=v${pkgver}?signed";)
-validpgpkeys=('672C657BE06B4B30969C4A57461449C25E36B98E'
-              'CABAA8D44DFACA14791FBE9892C44A3D421FF7F9'
-              '967F8AC5E2216F9F4FD270AD92AA783CBAAE8E3B'
-              'F1261BDE929012C8FF2E501D6EA5D7598529A53E')
+validpgpkeys=(
+  '672C657BE06B4B30969C4A57461449C25E36B98E' # Matthew Farina 
<m...@mattfarina.com>
+  'CABAA8D44DFACA14791FBE9892C44A3D421FF7F9' # Matthew Farina 
<matt.far...@rancher.com>
+  '967F8AC5E2216F9F4FD270AD92AA783CBAAE8E3B' # Matthew Fisher 
<matt.fis...@microsoft.com>
+  'F1261BDE929012C8FF2E501D6EA5D7598529A53E' # Martin Hickey 
<martin.hic...@ie.ibm.com>
+)
 sha256sums=('b03f5238f924d10872e453d58442b1fd493a321aff4b70178e9a94a47e1338e4')
 
-pkgver() {
-  cd "${pkgname}"
-  git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
 prepare() {
   cd "${pkgname}"
-  go mod tidy -compat=1.17
+  go mod download -x
 }
 
 build() {
-    cd "${pkgname}"
-    export CGO_LDFLAGS="$LDFLAGS"
-    export CGO_CFLAGS="$CFLAGS"
-    export CGO_CXXFLAGS="$CXXFLAGS"
-    export CGO_CPPFLAGS="$CPPFLAGS"
-    export CGO_ENABLED=1
-    make EXT_LDFLAGS="-linkmode external" GOFLAGS="-buildmode=pie -trimpath"
+  cd "${pkgname}"
+  export CGO_LDFLAGS="$LDFLAGS"
+  export CGO_CFLAGS="$CFLAGS"
+  export CGO_CXXFLAGS="$CXXFLAGS"
+  export CGO_CPPFLAGS="$CPPFLAGS"
+  export CGO_ENABLED=1
+  make EXT_LDFLAGS="-linkmode external" GOFLAGS="-buildmode=pie -trimpath"
 }
 
-check(){
-    cd "${pkgname}"
-    export CGO_LDFLAGS="$LDFLAGS"
-    export CGO_CFLAGS="$CFLAGS"
-    export CGO_CXXFLAGS="$CXXFLAGS"
-    export CGO_CPPFLAGS="$CPPFLAGS"
-    make LDFLAGS="-s -w -linkmode external" GOFLAGS="-buildmode=pie -trimpath" 
test-unit || true
+check() {
+  cd "${pkgname}"
+  local unit_tests=$(
+    go list ./... \
+      | grep -v helm.sh/helm/v3/pkg/registry
+  )
+  # shellcheck disable=2086
+  go test $unit_tests
 }
 
-package(){
-    cd "${pkgname}"
-    install -Dm755 bin/helm -t "$pkgdir/usr/bin"
-    bin/helm completion bash | install -Dm644 /dev/stdin 
"$pkgdir/usr/share/bash-completion/completions/helm"
-    bin/helm completion zsh | install -Dm644 /dev/stdin 
"$pkgdir/usr/share/zsh/site-functions/_helm"
+package() {
+  cd "${pkgname}"
+  install -Dm755 bin/helm -t "$pkgdir/usr/bin"
+  bin/helm completion bash | install -Dm644 /dev/stdin 
"$pkgdir/usr/share/bash-completion/completions/helm"
+  bin/helm completion zsh | install -Dm644 /dev/stdin 
"$pkgdir/usr/share/zsh/site-functions/_helm"
+  bin/helm completion fish | install -Dm644 /dev/stdin 
"$pkgdir/usr/share/fish/vendor_completions.d/helm.fish"
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/helm/-/compare/35ced5fd4b6428295c0107e5e9665d16d08363e7...92ea850e58d43f40f0404481b48986c80ae4a03d

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/helm/-/compare/35ced5fd4b6428295c0107e5e9665d16d08363e7...92ea850e58d43f40f0404481b48986c80ae4a03d
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to