From bc29b809129a91b7c38827ff8423c014383f3f7e Mon Sep 17 00:00:00 2001 From: Aurel Canciu Date: Mon, 30 Nov 2020 21:18:46 +0200 Subject: [PATCH 1/5] Add PKGBUILD templates Signed-off-by: Aurel Canciu --- ci/aur/flux-bin/.SRCINFO.template | 17 ++++++++++++ ci/aur/flux-bin/PKGBUILD.template | 39 +++++++++++++++++++++++++++ ci/aur/flux-git/.SRCINFO.template | 19 +++++++++++++ ci/aur/flux-git/PKGBUILD.template | 45 +++++++++++++++++++++++++++++++ ci/aur/flux-go/.SRCINFO.template | 19 +++++++++++++ ci/aur/flux-go/PKGBUILD.template | 43 +++++++++++++++++++++++++++++ 6 files changed, 182 insertions(+) create mode 100644 ci/aur/flux-bin/.SRCINFO.template create mode 100644 ci/aur/flux-bin/PKGBUILD.template create mode 100644 ci/aur/flux-git/.SRCINFO.template create mode 100644 ci/aur/flux-git/PKGBUILD.template create mode 100644 ci/aur/flux-go/.SRCINFO.template create mode 100644 ci/aur/flux-go/PKGBUILD.template diff --git a/ci/aur/flux-bin/.SRCINFO.template b/ci/aur/flux-bin/.SRCINFO.template new file mode 100644 index 00000000..7f20ef92 --- /dev/null +++ b/ci/aur/flux-bin/.SRCINFO.template @@ -0,0 +1,17 @@ +pkgbase = flux-bin + pkgdesc = Open and extensible continuous delivery solution for Kubernetes + pkgver = ${PKGVER} + pkgrel = ${PKGREL} + url = https://fluxcd.io/ + arch = x86_64 + arch = armv6h + arch = armv7h + arch = aarch64 + license = APACHE + optdepends = kubectl + source_x86_64 = flux-bin-${PKGVER}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v1/flux_${PKGVER}_linux_amd64.tar.gz + source_armv6h = flux-bin-${PKGVER}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v1/flux_${PKGVER}_linux_arm.tar.gz + source_armv7h = flux-bin-${PKGVER}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v1/flux_${PKGVER}_linux_arm.tar.gz + source_aarch64 = flux-bin-${PKGVER}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v1/flux_${PKGVER}_linux_arm64.tar.gz + +pkgname = flux-bin diff --git a/ci/aur/flux-bin/PKGBUILD.template b/ci/aur/flux-bin/PKGBUILD.template new file mode 100644 index 00000000..6bb09e17 --- /dev/null +++ b/ci/aur/flux-bin/PKGBUILD.template @@ -0,0 +1,39 @@ +# Maintainer: Aurel Canciu +# Maintainer: Hidde Beydals + +pkgname=flux-bin +pkgver=${PKGVER} +pkgrel=${PKGREL} +pkgdesc="Open and extensible continuous delivery solution for Kubernetes" +url="https://fluxcd.io/" +arch=("x86_64" "armv6h" "armv7h" "aarch64") +license=("APACHE") +optdepends=("kubectl") +source_x86_64=( + "$pkgname-$pkgver.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_amd64.tar.gz" +) +source_armv6h=( + "$pkgname-$pkgver.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_arm.tar.gz" +) +source_armv7h=( + "$pkgname-$pkgver.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_arm.tar.gz" +) +source_aarch64=( + "$pkgname-$pkgver.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_arm64.tar.gz" +) +sha256sums_x86_64=( + ${SHA256SUM_AMD64} +) +sha256sums_armv6h=( + ${SHA256SUM_ARM} +) +sha256sums_armv7h=( + ${SHA256SUM_ARM} +) +sha256sums_aarch64=( + ${SHA256SUM_ARM64} +) + +package() { + install -Dm755 flux "$pkgdir/usr/bin/flux" +} diff --git a/ci/aur/flux-git/.SRCINFO.template b/ci/aur/flux-git/.SRCINFO.template new file mode 100644 index 00000000..54ce3ad2 --- /dev/null +++ b/ci/aur/flux-git/.SRCINFO.template @@ -0,0 +1,19 @@ +pkgbase = flux-git + pkgdesc = Open and extensible continuous delivery solution for Kubernetes + pkgver = ${PKGVER} + pkgrel = ${PKGREL} + url = https://fluxcd.io/ + arch = x86_64 + arch = armv6h + arch = armv7h + arch = aarch64 + license = APACHE + makedepends = go + depends = glibc + optdepends = kubectl + provides = flux-bin + conflicts = flux-bin + source = git+https://github.com/fluxcd/flux2.git + md5sums = SKIP + +pkgname = flux-git diff --git a/ci/aur/flux-git/PKGBUILD.template b/ci/aur/flux-git/PKGBUILD.template new file mode 100644 index 00000000..4d3a233d --- /dev/null +++ b/ci/aur/flux-git/PKGBUILD.template @@ -0,0 +1,45 @@ +# Maintainer: Aurel Canciu +# Maintainer: Hidde Beydals + +pkgname=flux-git +pkgver=${PKGVER} +pkgrel=${PKGREL} +pkgdesc="Open and extensible continuous delivery solution for Kubernetes" +url="https://fluxcd.io/" +arch=("x86_64" "armv6h" "armv7h" "aarch64") +license=("APACHE") +provides=("flux-bin") +conflicts=("flux-bin") +depends=("glibc") +makedepends=("go") +optdepends=("kubectl") +source=( + "git+https://github.com/fluxcd/flux2.git" +) +md5sums=('SKIP') + +pkgver() { + cd "flux2" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +build() { + cd "flux2" + export CGO_LDFLAGS="$LDFLAGS" + export CGO_CFLAGS="$CFLAGS" + export CGO_CXXFLAGS="$CXXFLAGS" + export CGO_CPPFLAGS="$CPPFLAGS" + export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" + go build -ldflags "-X main.VERSION=$pkgver" -o flux-bin ./cmd/flux +} + +check() { + cd "flux2" + make test +} + +package() { + cd "flux2" + install -Dm755 flux-bin "$pkgdir/usr/bin/flux" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/ci/aur/flux-go/.SRCINFO.template b/ci/aur/flux-go/.SRCINFO.template new file mode 100644 index 00000000..ba0cfd77 --- /dev/null +++ b/ci/aur/flux-go/.SRCINFO.template @@ -0,0 +1,19 @@ +pkgbase = flux-go + pkgdesc = Open and extensible continuous delivery solution for Kubernetes + pkgver = ${PKGVER} + pkgrel = ${PKGREL} + url = https://fluxcd.io/ + arch = x86_64 + arch = armv6h + arch = armv7h + arch = aarch64 + license = APACHE + makedepends = go + depends = glibc + optdepends = kubectl + provides = flux-bin + conflicts = flux-bin + replaces = flux-cli + source = flux-go-${PKGVER}.tar.gz::https://github.com/fluxcd/flux2/archive/v${PKGVER}.tar.gz + +pkgname = flux-go diff --git a/ci/aur/flux-go/PKGBUILD.template b/ci/aur/flux-go/PKGBUILD.template new file mode 100644 index 00000000..c5747339 --- /dev/null +++ b/ci/aur/flux-go/PKGBUILD.template @@ -0,0 +1,43 @@ +# Maintainer: Aurel Canciu +# Maintainer: Hidde Beydals + +pkgname=flux-go +pkgver=${PKGVER} +pkgrel=${PKGREL} +pkgdesc="Open and extensible continuous delivery solution for Kubernetes" +url="https://fluxcd.io/" +arch=("x86_64" "armv6h" "armv7h" "aarch64") +license=("APACHE") +provides=("flux-bin") +conflicts=("flux-bin") +replaces=("flux-cli") +depends=("glibc") +makedepends=("go") +optdepends=("kubectl") +source=( + "$pkgname-$pkgver.tar.gz::https://github.com/fluxcd/flux2/archive/v$pkgver.tar.gz" +) +sha256sums=( + ${SHA256SUM} +) + +build() { + cd "flux2-$pkgver" + export CGO_LDFLAGS="$LDFLAGS" + export CGO_CFLAGS="$CFLAGS" + export CGO_CXXFLAGS="$CXXFLAGS" + export CGO_CPPFLAGS="$CPPFLAGS" + export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" + go build -ldflags "-X main.VERSION=$pkgver" -o flux-bin ./cmd/flux +} + +check() { + cd "flux2-$pkgver" + make test +} + +package() { + cd "flux2-$pkgver" + install -Dm755 flux-bin "$pkgdir/usr/bin/flux" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} From 5c522ed2e1c0e74f323b4e79ff74ee89bb8119e2 Mon Sep 17 00:00:00 2001 From: Aurel Canciu Date: Thu, 3 Dec 2020 02:08:25 +0200 Subject: [PATCH 2/5] Add publisher scripts and gorelease config Signed-off-by: Aurel Canciu --- .goreleaser.yml | 18 +++++++++++++++ ci/aur/flux-bin/.gitignore | 1 + ci/aur/flux-bin/publish.sh | 46 ++++++++++++++++++++++++++++++++++++++ ci/aur/flux-git/.gitignore | 1 + ci/aur/flux-git/publish.sh | 42 ++++++++++++++++++++++++++++++++++ ci/aur/flux-go/.gitignore | 1 + ci/aur/flux-go/publish.sh | 44 ++++++++++++++++++++++++++++++++++++ 7 files changed, 153 insertions(+) create mode 100644 ci/aur/flux-bin/.gitignore create mode 100755 ci/aur/flux-bin/publish.sh create mode 100644 ci/aur/flux-git/.gitignore create mode 100755 ci/aur/flux-git/publish.sh create mode 100644 ci/aur/flux-go/.gitignore create mode 100755 ci/aur/flux-go/publish.sh diff --git a/.goreleaser.yml b/.goreleaser.yml index c72e9af0..9650bf0d 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -50,3 +50,21 @@ brews: type: optional test: | system "#{bin}/flux --version" +publishers: + - name: aur-pkg-bin + ids: + - nix + cmd: | + eval $(ssh-agent -s) + ssh-add <(echo "{{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}") + ci/aur/flux-bin/publish.sh {{ .Version }} + - name: aur-pkg-git + cmd: | + eval $(ssh-agent -s) + ssh-add <(echo "{{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}") + ci/aur/flux-git/publish.sh {{ .Version }} + - name: aur-pkg-go + cmd: | + eval $(ssh-agent -s) + ssh-add <(echo "{{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}") + ci/aur/flux-go/publish.sh {{ .Version }} diff --git a/ci/aur/flux-bin/.gitignore b/ci/aur/flux-bin/.gitignore new file mode 100644 index 00000000..5a6ed48b --- /dev/null +++ b/ci/aur/flux-bin/.gitignore @@ -0,0 +1 @@ +.pkg diff --git a/ci/aur/flux-bin/publish.sh b/ci/aur/flux-bin/publish.sh new file mode 100755 index 00000000..54513023 --- /dev/null +++ b/ci/aur/flux-bin/publish.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +set -e + +WD=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd) +PKGNAME=$(basename $WD) +ROOT=${WD%/ci/aur/$PKGNAME} + +export VERSION=$1 +echo "Publishing to AUR as version ${VERSION}" + +cd $WD + +export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" + +rm -rf .pkg +git clone aur@aur.archlinux.org:$PKGNAME .pkg 2>&1 + +CURRENT_PKGVER=$(cat .pkg/.SRCINFO | grep pkgver | awk '{ print $3 }') +CURRENT_PKGREL=$(cat .pkg/.SRCINFO | grep pkgrel | awk '{ print $3 }') + +export PKGVER=${VERSION/-/} + +if [[ "${CURRENT_PKGVER}" == "${PKGVER}" ]]; then + export PKGREL=$((CURRENT_PKGREL+1)) +else + export PKGREL=1 +fi + +export SHA256SUM_ARM=$(sha256sum ${ROOT}/dist/flux_${PKGVER}_linux_arm.tar.gz | awk '{ print $1 }') +export SHA256SUM_ARM64=$(sha256sum ${ROOT}/dist/flux_${PKGVER}_linux_arm64.tar.gz | awk '{ print $1 }') +export SHA256SUM_AMD64=$(sha256sum ${ROOT}/dist/flux_0.4.2_linux_amd64.tar.gz | awk '{ print $1 }') + +envsubst '$PKGVER $PKGREL $SHA256SUM_AMD64 $SHA256SUM_ARM $SHA256SUM_ARM64' < .SRCINFO.template > .pkg/.SRCINFO +envsubst '$PKGVER $PKGREL $SHA256SUM_AMD64 $SHA256SUM_ARM $SHA256SUM_ARM64' < PKGBUILD.template > .pkg/PKGBUILD + +cd .pkg +git config user.name "fluxcdbot" +git config user.email "fluxcdbot@users.noreply.github.com" +git add -A +if [ -z "$(git status --porcelain)" ]; then + echo "No changes." +else + git commit -m "Updated to version v${PKGVER} release ${PKGREL}" + git push origin master +fi diff --git a/ci/aur/flux-git/.gitignore b/ci/aur/flux-git/.gitignore new file mode 100644 index 00000000..5a6ed48b --- /dev/null +++ b/ci/aur/flux-git/.gitignore @@ -0,0 +1 @@ +.pkg diff --git a/ci/aur/flux-git/publish.sh b/ci/aur/flux-git/publish.sh new file mode 100755 index 00000000..bc2f21a9 --- /dev/null +++ b/ci/aur/flux-git/publish.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash + +set -e + +WD=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd) +PKGNAME=$(basename $WD) +ROOT=${WD%/ci/aur/$PKGNAME} + +export VERSION=$1 +echo "Publishing to AUR as version ${VERSION}" + +cd $WD + +export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" + +rm -rf .pkg +git clone aur@aur.archlinux.org:$PKGNAME .pkg 2>&1 + +CURRENT_PKGVER=$(cat .pkg/.SRCINFO | grep pkgver | awk '{ print $3 }') +CURRENT_PKGREL=$(cat .pkg/.SRCINFO | grep pkgrel | awk '{ print $3 }') + +export PKGVER=${VERSION/-/} + +if [[ "${CURRENT_PKGVER}" == "${PKGVER}" ]]; then + export PKGREL=$((CURRENT_PKGREL+1)) +else + export PKGREL=1 +fi + +envsubst '$PKGVER $PKGREL' < .SRCINFO.template > .pkg/.SRCINFO +envsubst '$PKGVER $PKGREL' < PKGBUILD.template > .pkg/PKGBUILD + +cd .pkg +git config user.name "fluxcdbot" +git config user.email "fluxcdbot@users.noreply.github.com" +git add -A +if [ -z "$(git status --porcelain)" ]; then + echo "No changes." +else + git commit -m "Updated to version v${PKGVER} release ${PKGREL}" + git push origin master +fi diff --git a/ci/aur/flux-go/.gitignore b/ci/aur/flux-go/.gitignore new file mode 100644 index 00000000..5a6ed48b --- /dev/null +++ b/ci/aur/flux-go/.gitignore @@ -0,0 +1 @@ +.pkg diff --git a/ci/aur/flux-go/publish.sh b/ci/aur/flux-go/publish.sh new file mode 100755 index 00000000..4c96417d --- /dev/null +++ b/ci/aur/flux-go/publish.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +set -e + +WD=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd) +PKGNAME=$(basename $WD) +ROOT=${WD%/ci/aur/$PKGNAME} + +export VERSION=$1 +echo "Publishing to AUR as version ${VERSION}" + +cd $WD + +export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" + +rm -rf .pkg +git clone aur@aur.archlinux.org:$PKGNAME .pkg 2>&1 + +CURRENT_PKGVER=$(cat .pkg/.SRCINFO | grep pkgver | awk '{ print $3 }') +CURRENT_PKGREL=$(cat .pkg/.SRCINFO | grep pkgrel | awk '{ print $3 }') + +export PKGVER=${VERSION/-/} + +if [[ "${CURRENT_PKGVER}" == "${PKGVER}" ]]; then + export PKGREL=$((CURRENT_PKGREL+1)) +else + export PKGREL=1 +fi + +export SHA256SUM=$(curl -sL https://github.com/fluxcd/flux2/archive/v$PKGVER.tar.gz | sha256sum | awk '{ print $1 }') + +envsubst '$PKGVER $PKGREL $SHA256SUM' < .SRCINFO.template > .pkg/.SRCINFO +envsubst '$PKGVER $PKGREL $SHA256SUM' < PKGBUILD.template > .pkg/PKGBUILD + +cd .pkg +git config user.name "fluxcdbot" +git config user.email "fluxcdbot@users.noreply.github.com" +git add -A +if [ -z "$(git status --porcelain)" ]; then + echo "No changes." +else + git commit -m "Updated to version v${PKGVER} release ${PKGREL}" + git push origin master +fi From b6f30ae3e1606e86953f591a34ed723a1dc05f91 Mon Sep 17 00:00:00 2001 From: Aurel Canciu Date: Thu, 3 Dec 2020 11:27:57 +0200 Subject: [PATCH 3/5] Move aur package templates to .github/aur Signed-off-by: Aurel Canciu --- {ci => .github}/aur/flux-bin/.SRCINFO.template | 0 {ci => .github}/aur/flux-bin/.gitignore | 0 {ci => .github}/aur/flux-bin/PKGBUILD.template | 0 {ci => .github}/aur/flux-bin/publish.sh | 2 +- {ci => .github}/aur/flux-git/.SRCINFO.template | 0 {ci => .github}/aur/flux-git/.gitignore | 0 {ci => .github}/aur/flux-git/PKGBUILD.template | 0 {ci => .github}/aur/flux-git/publish.sh | 2 +- {ci => .github}/aur/flux-go/.SRCINFO.template | 0 {ci => .github}/aur/flux-go/.gitignore | 0 {ci => .github}/aur/flux-go/PKGBUILD.template | 0 {ci => .github}/aur/flux-go/publish.sh | 2 +- .goreleaser.yml | 6 +++--- 13 files changed, 6 insertions(+), 6 deletions(-) rename {ci => .github}/aur/flux-bin/.SRCINFO.template (100%) rename {ci => .github}/aur/flux-bin/.gitignore (100%) rename {ci => .github}/aur/flux-bin/PKGBUILD.template (100%) rename {ci => .github}/aur/flux-bin/publish.sh (97%) rename {ci => .github}/aur/flux-git/.SRCINFO.template (100%) rename {ci => .github}/aur/flux-git/.gitignore (100%) rename {ci => .github}/aur/flux-git/PKGBUILD.template (100%) rename {ci => .github}/aur/flux-git/publish.sh (96%) rename {ci => .github}/aur/flux-go/.SRCINFO.template (100%) rename {ci => .github}/aur/flux-go/.gitignore (100%) rename {ci => .github}/aur/flux-go/PKGBUILD.template (100%) rename {ci => .github}/aur/flux-go/publish.sh (97%) diff --git a/ci/aur/flux-bin/.SRCINFO.template b/.github/aur/flux-bin/.SRCINFO.template similarity index 100% rename from ci/aur/flux-bin/.SRCINFO.template rename to .github/aur/flux-bin/.SRCINFO.template diff --git a/ci/aur/flux-bin/.gitignore b/.github/aur/flux-bin/.gitignore similarity index 100% rename from ci/aur/flux-bin/.gitignore rename to .github/aur/flux-bin/.gitignore diff --git a/ci/aur/flux-bin/PKGBUILD.template b/.github/aur/flux-bin/PKGBUILD.template similarity index 100% rename from ci/aur/flux-bin/PKGBUILD.template rename to .github/aur/flux-bin/PKGBUILD.template diff --git a/ci/aur/flux-bin/publish.sh b/.github/aur/flux-bin/publish.sh similarity index 97% rename from ci/aur/flux-bin/publish.sh rename to .github/aur/flux-bin/publish.sh index 54513023..8f661530 100755 --- a/ci/aur/flux-bin/publish.sh +++ b/.github/aur/flux-bin/publish.sh @@ -4,7 +4,7 @@ set -e WD=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd) PKGNAME=$(basename $WD) -ROOT=${WD%/ci/aur/$PKGNAME} +ROOT=${WD%/.github/aur/$PKGNAME} export VERSION=$1 echo "Publishing to AUR as version ${VERSION}" diff --git a/ci/aur/flux-git/.SRCINFO.template b/.github/aur/flux-git/.SRCINFO.template similarity index 100% rename from ci/aur/flux-git/.SRCINFO.template rename to .github/aur/flux-git/.SRCINFO.template diff --git a/ci/aur/flux-git/.gitignore b/.github/aur/flux-git/.gitignore similarity index 100% rename from ci/aur/flux-git/.gitignore rename to .github/aur/flux-git/.gitignore diff --git a/ci/aur/flux-git/PKGBUILD.template b/.github/aur/flux-git/PKGBUILD.template similarity index 100% rename from ci/aur/flux-git/PKGBUILD.template rename to .github/aur/flux-git/PKGBUILD.template diff --git a/ci/aur/flux-git/publish.sh b/.github/aur/flux-git/publish.sh similarity index 96% rename from ci/aur/flux-git/publish.sh rename to .github/aur/flux-git/publish.sh index bc2f21a9..e599e71f 100755 --- a/ci/aur/flux-git/publish.sh +++ b/.github/aur/flux-git/publish.sh @@ -4,7 +4,7 @@ set -e WD=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd) PKGNAME=$(basename $WD) -ROOT=${WD%/ci/aur/$PKGNAME} +ROOT=${WD%/.github/aur/$PKGNAME} export VERSION=$1 echo "Publishing to AUR as version ${VERSION}" diff --git a/ci/aur/flux-go/.SRCINFO.template b/.github/aur/flux-go/.SRCINFO.template similarity index 100% rename from ci/aur/flux-go/.SRCINFO.template rename to .github/aur/flux-go/.SRCINFO.template diff --git a/ci/aur/flux-go/.gitignore b/.github/aur/flux-go/.gitignore similarity index 100% rename from ci/aur/flux-go/.gitignore rename to .github/aur/flux-go/.gitignore diff --git a/ci/aur/flux-go/PKGBUILD.template b/.github/aur/flux-go/PKGBUILD.template similarity index 100% rename from ci/aur/flux-go/PKGBUILD.template rename to .github/aur/flux-go/PKGBUILD.template diff --git a/ci/aur/flux-go/publish.sh b/.github/aur/flux-go/publish.sh similarity index 97% rename from ci/aur/flux-go/publish.sh rename to .github/aur/flux-go/publish.sh index 4c96417d..ed84332c 100755 --- a/ci/aur/flux-go/publish.sh +++ b/.github/aur/flux-go/publish.sh @@ -4,7 +4,7 @@ set -e WD=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd) PKGNAME=$(basename $WD) -ROOT=${WD%/ci/aur/$PKGNAME} +ROOT=${WD%/.github/aur/$PKGNAME} export VERSION=$1 echo "Publishing to AUR as version ${VERSION}" diff --git a/.goreleaser.yml b/.goreleaser.yml index 9650bf0d..0eee4c18 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -57,14 +57,14 @@ publishers: cmd: | eval $(ssh-agent -s) ssh-add <(echo "{{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}") - ci/aur/flux-bin/publish.sh {{ .Version }} + .github/aur/flux-bin/publish.sh {{ .Version }} - name: aur-pkg-git cmd: | eval $(ssh-agent -s) ssh-add <(echo "{{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}") - ci/aur/flux-git/publish.sh {{ .Version }} + .github/aur/flux-git/publish.sh {{ .Version }} - name: aur-pkg-go cmd: | eval $(ssh-agent -s) ssh-add <(echo "{{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}") - ci/aur/flux-go/publish.sh {{ .Version }} + .github/aur/flux-go/publish.sh {{ .Version }} From 116ccd6b3b290d2001be46656319989071c61e03 Mon Sep 17 00:00:00 2001 From: Aurel Canciu Date: Thu, 3 Dec 2020 12:22:21 +0200 Subject: [PATCH 4/5] Rename flux-git to flux-scm to prevent collision A flux-git package already exists in AUR Signed-off-by: Aurel Canciu --- .github/aur/{flux-git => flux-scm}/.SRCINFO.template | 4 ++-- .github/aur/{flux-git => flux-scm}/.gitignore | 0 .github/aur/{flux-git => flux-scm}/PKGBUILD.template | 2 +- .github/aur/{flux-git => flux-scm}/publish.sh | 0 .goreleaser.yml | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename .github/aur/{flux-git => flux-scm}/.SRCINFO.template (91%) rename .github/aur/{flux-git => flux-scm}/.gitignore (100%) rename .github/aur/{flux-git => flux-scm}/PKGBUILD.template (98%) rename .github/aur/{flux-git => flux-scm}/publish.sh (100%) diff --git a/.github/aur/flux-git/.SRCINFO.template b/.github/aur/flux-scm/.SRCINFO.template similarity index 91% rename from .github/aur/flux-git/.SRCINFO.template rename to .github/aur/flux-scm/.SRCINFO.template index 54ce3ad2..e7f3288a 100644 --- a/.github/aur/flux-git/.SRCINFO.template +++ b/.github/aur/flux-scm/.SRCINFO.template @@ -1,4 +1,4 @@ -pkgbase = flux-git +pkgbase = flux-scm pkgdesc = Open and extensible continuous delivery solution for Kubernetes pkgver = ${PKGVER} pkgrel = ${PKGREL} @@ -16,4 +16,4 @@ pkgbase = flux-git source = git+https://github.com/fluxcd/flux2.git md5sums = SKIP -pkgname = flux-git +pkgname = flux-scm diff --git a/.github/aur/flux-git/.gitignore b/.github/aur/flux-scm/.gitignore similarity index 100% rename from .github/aur/flux-git/.gitignore rename to .github/aur/flux-scm/.gitignore diff --git a/.github/aur/flux-git/PKGBUILD.template b/.github/aur/flux-scm/PKGBUILD.template similarity index 98% rename from .github/aur/flux-git/PKGBUILD.template rename to .github/aur/flux-scm/PKGBUILD.template index 4d3a233d..09c0537b 100644 --- a/.github/aur/flux-git/PKGBUILD.template +++ b/.github/aur/flux-scm/PKGBUILD.template @@ -1,7 +1,7 @@ # Maintainer: Aurel Canciu # Maintainer: Hidde Beydals -pkgname=flux-git +pkgname=flux-scm pkgver=${PKGVER} pkgrel=${PKGREL} pkgdesc="Open and extensible continuous delivery solution for Kubernetes" diff --git a/.github/aur/flux-git/publish.sh b/.github/aur/flux-scm/publish.sh similarity index 100% rename from .github/aur/flux-git/publish.sh rename to .github/aur/flux-scm/publish.sh diff --git a/.goreleaser.yml b/.goreleaser.yml index 0eee4c18..1df84b11 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -58,11 +58,11 @@ publishers: eval $(ssh-agent -s) ssh-add <(echo "{{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}") .github/aur/flux-bin/publish.sh {{ .Version }} - - name: aur-pkg-git + - name: aur-pkg-scm cmd: | eval $(ssh-agent -s) ssh-add <(echo "{{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}") - .github/aur/flux-git/publish.sh {{ .Version }} + .github/aur/flux-scm/publish.sh {{ .Version }} - name: aur-pkg-go cmd: | eval $(ssh-agent -s) From c1f209c7a5026ac9b35b0edf50d5ab4da661535c Mon Sep 17 00:00:00 2001 From: Aurel Canciu Date: Thu, 3 Dec 2020 12:44:50 +0200 Subject: [PATCH 5/5] Add information about the AUR packages to docs Signed-off-by: Aurel Canciu --- README.md | 10 ++++++++++ docs/get-started/index.md | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/README.md b/README.md index 32120e73..6f445013 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,16 @@ curl -s https://toolkit.fluxcd.io/install.sh | sudo bash . <(flux completion bash) ``` +Arch Linux (AUR) packages: + +There are three packages published in AUR: +- [flux-bin](https://aur.archlinux.org/packages/flux-bin): install the latest + stable version using a pre-build binary (recommended) +- [flux-go](https://aur.archlinux.org/packages/flux-go): build the latest + stable version from source code +- [flux-scm](https://aur.archlinux.org/packages/flux-scm): build the latest + (unstable) version from source code from our git `main` branch + Binaries for macOS, Windows and Linux AMD64/ARM are available to download on the [release page](https://github.com/fluxcd/flux2/releases). diff --git a/docs/get-started/index.md b/docs/get-started/index.md index 15a165e7..ed43c342 100644 --- a/docs/get-started/index.md +++ b/docs/get-started/index.md @@ -34,6 +34,15 @@ curl -s https://toolkit.fluxcd.io/install.sh | sudo bash The install script downloads the flux binary to `/usr/local/bin`. +If using Arch Linux, there are three packages published in AUR you can use to +install `flux`: +- [flux-bin](https://aur.archlinux.org/packages/flux-bin): install the latest + stable version using a pre-build binary (recommended) +- [flux-go](https://aur.archlinux.org/packages/flux-go): build the latest + stable version from source code +- [flux-scm](https://aur.archlinux.org/packages/flux-scm): build the latest + (unstable) version from source code from our git `main` branch + Binaries for **macOS**, **Windows** and **Linux** AMD64/ARM are available for download on the [release page](https://github.com/fluxcd/flux2/releases).