mirror of
https://github.com/fluxcd/flux2.git
synced 2026-02-21 15:11:47 +00:00
Merge pull request #2296 from fluxcd/fix-pkgbuild-envtest
Fix Archlinux PKGBUILD check() run on ARM
This commit is contained in:
commit
677dca0bc4
2 changed files with 17 additions and 1 deletions
10
.github/aur/flux-go/PKGBUILD.template
vendored
10
.github/aur/flux-go/PKGBUILD.template
vendored
|
|
@ -30,12 +30,20 @@ build() {
|
||||||
export CGO_CXXFLAGS="$CXXFLAGS"
|
export CGO_CXXFLAGS="$CXXFLAGS"
|
||||||
export CGO_CPPFLAGS="$CPPFLAGS"
|
export CGO_CPPFLAGS="$CPPFLAGS"
|
||||||
export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
|
export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
|
||||||
./manifests/scripts/bundle.sh "${PWD}/manifests" "${PWD}/cmd/flux/manifests"
|
make cmd/flux/.manifests.done
|
||||||
go build -ldflags "-linkmode=external -X main.VERSION=${pkgver}" -o ${_srcname} ./cmd/flux
|
go build -ldflags "-linkmode=external -X main.VERSION=${pkgver}" -o ${_srcname} ./cmd/flux
|
||||||
}
|
}
|
||||||
|
|
||||||
check() {
|
check() {
|
||||||
cd "flux2-${pkgver}"
|
cd "flux2-${pkgver}"
|
||||||
|
case $CARCH in
|
||||||
|
aarch64)
|
||||||
|
export ENVTEST_ARCH=arm64
|
||||||
|
;;
|
||||||
|
armv6h|armv7h)
|
||||||
|
export ENVTEST_ARCH=arm
|
||||||
|
;;
|
||||||
|
esac
|
||||||
make test
|
make test
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
8
.github/aur/flux-scm/PKGBUILD.template
vendored
8
.github/aur/flux-scm/PKGBUILD.template
vendored
|
|
@ -38,6 +38,14 @@ build() {
|
||||||
|
|
||||||
check() {
|
check() {
|
||||||
cd "flux2"
|
cd "flux2"
|
||||||
|
case $CARCH in
|
||||||
|
aarch64)
|
||||||
|
export ENVTEST_ARCH=arm64
|
||||||
|
;;
|
||||||
|
armv6h|armv7h)
|
||||||
|
export ENVTEST_ARCH=arm
|
||||||
|
;;
|
||||||
|
esac
|
||||||
make test
|
make test
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue