From 2be7b6399eaae23529fa9d24b9fe5a63d0c9e9af Mon Sep 17 00:00:00 2001
From: Matthias Lisin <lisin@strato.de>
Date: Fri, 1 May 2020 19:15:15 +0200
Subject: [PATCH] upgpkg: golangci-lint 1.26.0-1
---
.SRCINFO | 8 ++++----
PKGBUILD | 26 +++++++++++++++-----------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/.SRCINFO b/.SRCINFO
index 9aed105..9d6a868 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = golangci-lint
pkgdesc = Linters Runner for Go. 5x faster than gometalinter.
- pkgver = 1.25.1
- pkgrel = 6
+ pkgver = 1.26.0
+ pkgrel = 1
url = https://github.com/golangci/golangci-lint
arch = x86_64
arch = i686
@@ -13,8 +13,8 @@ pkgbase = golangci-lint
makedepends = go
makedepends = gzip
depends = glibc
- source = golangci-lint-1.25.1.tar.gz::https://github.com/golangci/golangci-lint/archive/v1.25.1.tar.gz
- sha256sums = 034440e00f81d1b5adfe5e39bceb2f0b9cb19066195a61e750a4982bbe512cf3
+ source = golangci-lint-1.26.0.tar.gz::https://github.com/golangci/golangci-lint/archive/v1.26.0.tar.gz
+ sha256sums = fac66b685253d76625c18177e03d36bca0a5dac52a0c3978fc96daad07bcb704
pkgname = golangci-lint
diff --git a/PKGBUILD b/PKGBUILD
index c8e7962..6228da1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
# Maintainer: Matthias Lisin <ml@visu.li>
pkgname=golangci-lint
pkgdesc="Linters Runner for Go. 5x faster than gometalinter."
-pkgver=1.25.1
-pkgrel=6
+pkgver=1.26.0
+pkgrel=1
arch=('x86_64' 'i686' 'aarch64' 'armv7h' 'armv6h')
url='https://github.com/golangci/golangci-lint'
license=('GPL3')
depends=('glibc')
makedepends=('git' 'go' 'gzip')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/golangci/golangci-lint/archive/v${pkgver}.tar.gz")
-sha256sums=('034440e00f81d1b5adfe5e39bceb2f0b9cb19066195a61e750a4982bbe512cf3')
+sha256sums=('fac66b685253d76625c18177e03d36bca0a5dac52a0c3978fc96daad07bcb704')
prepare() {
cd "${pkgname}-${pkgver}"
@@ -17,15 +17,18 @@ prepare() {
}
build() {
- export CGO_LDFLAGS="${LDFLAGS}"
- export CGO_CFLAGS="${CFLAGS}"
- export GOFLAGS='-buildmode=pie -trimpath -modcacherw'
+ local _commit _flags
_commit=$(zcat "${pkgname}-${pkgver}.tar.gz" | git get-tar-commit-id)
_flags=(
-X=main.version=$pkgver
-X=main.commit=${_commit::7}
-X=main.date=$(date -u -d "@${SOURCE_DATE_EPOCH}" +'%FT%TZ')
)
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="$CPPFLAGS"
+ export CGO_CXXFLAGS="$CXXFLAGS"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export GOFLAGS='-buildmode=pie -trimpath -modcacherw -mod=readonly'
cd "${pkgname}-${pkgver}"
go build -o "$pkgname" -ldflags="${_flags[*]}" ./cmd/"$pkgname"
}
@@ -34,14 +37,15 @@ check() {
cd "${pkgname}-${pkgver}"
# some tests build the binary and overwrite our build
chmod 555 "$pkgname" # canary
- unset CGO_LDFLAGS CGO_CFLAGS GOFLAGS
+ # CGO_CFLAGS break tests when run inside ~/.cache (yay).
+ # TODO investigate
+ unset CGO_CFLAGS
GOLANGCI_LINT_INSTALLED=true go test ./...
}
package() {
cd "${pkgname}-${pkgver}"
- install -dm755 "$pkgdir"/usr/share/{bash-completion/completions,zsh/site-functions}
- install -Dm755 "$pkgname" "$pkgdir"/usr/bin/"$pkgname"
- ./"$pkgname" completion bash >"$pkgdir"/usr/share/bash-completion/completions/golangci-lint
- ./"$pkgname" completion zsh >"$pkgdir"/usr/share/zsh/site-functions/_golangci-lint
+ install -Dm755 "$pkgname" -t "$pkgdir"/usr/bin
+ ./"$pkgname" completion bash | install -Dm644 /dev/stdin "$pkgdir"/usr/share/bash-completion/completions/golangci-lint
+ ./"$pkgname" completion zsh | install -Dm644 /dev/stdin "$pkgdir"/usr/share/zsh/site-functions/_golangci-lint
}