diff --git a/.github/aur/flux-bin/publish.sh b/.github/aur/flux-bin/publish.sh index ecdbc9765c5e4be1dd643bce4cada65e929818a8..0e6097c10d0546ab11d99d27cf2343d59ee13f75 100755 --- a/.github/aur/flux-bin/publish.sh +++ b/.github/aur/flux-bin/publish.sh @@ -6,6 +6,11 @@ WD=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd) PKGNAME=$(basename $WD) ROOT=${WD%/.github/aur/$PKGNAME} +LOCKFILE=/tmp/aur-$PKGNAME.lock +exec 100>$LOCKFILE || exit 0 +flock -n 100 || exit 0 +trap "rm -f $LOCKFILE" EXIT + export VERSION=$1 echo "Publishing to AUR as version ${VERSION}" diff --git a/.github/aur/flux-go/publish.sh b/.github/aur/flux-go/publish.sh index 6ecf74950d8ed087ad544e7065846a36f4c18c4a..bea591dd351d48a361a4b52a3128541633702101 100755 --- a/.github/aur/flux-go/publish.sh +++ b/.github/aur/flux-go/publish.sh @@ -6,6 +6,11 @@ WD=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd) PKGNAME=$(basename $WD) ROOT=${WD%/.github/aur/$PKGNAME} +LOCKFILE=/tmp/aur-$PKGNAME.lock +exec 100>$LOCKFILE || exit 0 +flock -n 100 || exit 0 +trap "rm -f $LOCKFILE" EXIT + export VERSION=$1 echo "Publishing to AUR as version ${VERSION}" diff --git a/.github/aur/flux-scm/publish.sh b/.github/aur/flux-scm/publish.sh index 193e353fd1d60ca34281089297becd2c85c42a6b..0b743c2989deed2c606f511850e7f55e54f20ed8 100755 --- a/.github/aur/flux-scm/publish.sh +++ b/.github/aur/flux-scm/publish.sh @@ -6,6 +6,11 @@ WD=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd) PKGNAME=$(basename $WD) ROOT=${WD%/.github/aur/$PKGNAME} +LOCKFILE=/tmp/aur-$PKGNAME.lock +exec 100>$LOCKFILE || exit 0 +flock -n 100 || exit 0 +trap "rm -f $LOCKFILE" EXIT + export VERSION=$1 echo "Publishing to AUR as version ${VERSION}" diff --git a/.goreleaser.yml b/.goreleaser.yml index f1986feeb08f9c5964c76107f4fa7b4890c84f75..8a6de6a0c21f7003587fa94090eaf228e697941c 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -23,15 +23,6 @@ builds: id: windows goos: - windows - - id: aurmock - binary: aurmock - main: ./cmd/flux - env: - - CGO_ENABLED=0 - goos: - - linux - goarch: - - amd64 archives: - name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}" id: nix @@ -45,9 +36,6 @@ archives: format: zip files: - none* - - name_template: "aur_{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}" - id: aur - builds: [aurmock] brews: - name: flux tap: @@ -64,30 +52,21 @@ brews: system "#{bin}/flux --version" publishers: - name: aur-pkg-bin - ids: - - aur env: - AUR_BOT_SSH_PRIVATE_KEY={{ .Env.AUR_BOT_SSH_PRIVATE_KEY }} cmd: | .github/aur/flux-bin/publish.sh {{ .Version }} - name: aur-pkg-scm - ids: - - aur env: - AUR_BOT_SSH_PRIVATE_KEY={{ .Env.AUR_BOT_SSH_PRIVATE_KEY }} cmd: | .github/aur/flux-scm/publish.sh {{ .Version }} - name: aur-pkg-go - ids: - - aur env: - AUR_BOT_SSH_PRIVATE_KEY={{ .Env.AUR_BOT_SSH_PRIVATE_KEY }} cmd: | .github/aur/flux-go/publish.sh {{ .Version }} release: - ids: - - nix - - windows extra_files: - glob: ./output/manifests.tar.gz - glob: ./output/install.yaml