From e664ef7a8d68ae177eb96d58a83f3ef0a0aaa435 Mon Sep 17 00:00:00 2001
From: Aurel Canciu <aurelcanciu@gmail.com>
Date: Fri, 4 Dec 2020 20:08:32 +0200
Subject: [PATCH] Fix GoReleaser AUR package publishing

Signed-off-by: Aurel Canciu <aurelcanciu@gmail.com>
---
 .github/aur/flux-bin/publish.sh |  3 +++
 .github/aur/flux-go/publish.sh  |  3 +++
 .github/aur/flux-scm/publish.sh |  3 +++
 .goreleaser.yml                 | 12 ++++++------
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/aur/flux-bin/publish.sh b/.github/aur/flux-bin/publish.sh
index 8f661530..a14dfefa 100755
--- a/.github/aur/flux-bin/publish.sh
+++ b/.github/aur/flux-bin/publish.sh
@@ -13,6 +13,9 @@ cd $WD
 
 export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
+eval $(ssh-agent -s)
+ssh-add <(echo "$AUR_BOT_SSH_PRIVATE_KEY")
+
 rm -rf .pkg
 git clone aur@aur.archlinux.org:$PKGNAME .pkg 2>&1
 
diff --git a/.github/aur/flux-go/publish.sh b/.github/aur/flux-go/publish.sh
index ed84332c..71ec8b2c 100755
--- a/.github/aur/flux-go/publish.sh
+++ b/.github/aur/flux-go/publish.sh
@@ -13,6 +13,9 @@ cd $WD
 
 export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
+eval $(ssh-agent -s)
+ssh-add <(echo "$AUR_BOT_SSH_PRIVATE_KEY")
+
 rm -rf .pkg
 git clone aur@aur.archlinux.org:$PKGNAME .pkg 2>&1
 
diff --git a/.github/aur/flux-scm/publish.sh b/.github/aur/flux-scm/publish.sh
index e599e71f..c0e86c78 100755
--- a/.github/aur/flux-scm/publish.sh
+++ b/.github/aur/flux-scm/publish.sh
@@ -13,6 +13,9 @@ cd $WD
 
 export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
+eval $(ssh-agent -s)
+ssh-add <(echo "$AUR_BOT_SSH_PRIVATE_KEY")
+
 rm -rf .pkg
 git clone aur@aur.archlinux.org:$PKGNAME .pkg 2>&1
 
diff --git a/.goreleaser.yml b/.goreleaser.yml
index d652ef5c..eda823d7 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -54,19 +54,19 @@ publishers:
   - name: aur-pkg-bin
     ids:
       - nix
+    env:
+      - AUR_BOT_SSH_PRIVATE_KEY={{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}
     cmd: |
-      eval $(ssh-agent -s)
-      ssh-add <(echo "{{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}")
       .github/aur/flux-bin/publish.sh {{ .Version }}
   - name: aur-pkg-scm
+    env:
+      - AUR_BOT_SSH_PRIVATE_KEY={{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}
     cmd: |
-      eval $(ssh-agent -s)
-      ssh-add <(echo "{{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}")
       .github/aur/flux-scm/publish.sh {{ .Version }}
   - name: aur-pkg-go
+    env:
+      - AUR_BOT_SSH_PRIVATE_KEY={{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}
     cmd: |
-      eval $(ssh-agent -s)
-      ssh-add <(echo "{{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}")
       .github/aur/flux-go/publish.sh {{ .Version }}
 release:
   extra_files:
-- 
GitLab