Rework announce workflow

Author: kenshaw

.github/workflows/announce.yml

@@ -7,8 +7,6 @@ env:
   AUTHOR_NAME: Kenneth Shaw
   AUTHOR_EMAIL: kenshaw@gmail.com
   HOMEBREW_REPO: https://kenshaw:${{ secrets.HOMEBREW_TOKEN }}@github.com/xo/homebrew-xo.git
-  AUR_REPO: aur@aur.archlinux.org:usql.git
-  AUR_BIN_REPO: aur@aur.archlinux.org:usql-bin.git
 
 # cribbed from https://github.com/actions/runner/issues/691
 jobs:
@@ -28,10 +26,23 @@ jobs:
     needs: configure
     container:
       image: docker.io/library/archlinux:latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - package: usql
+            repo: aur@aur.archlinux.org:usql.git
+          - package: usql-bin
+            repo: aur@aur.archlinux.org:usql-bin.git
+
     steps:
-      - name: Add archlinux tools
+      - name: Setup
         run: |
-          pacman -Sy --noconfirm pacman-contrib devtools
+          pacman-key --init
+          pacman -Sy --noconfirm archlinux-keyring
+          pacman -Sy --noconfirm git base-devel sudo pacman-contrib devtools
+          useradd -m ${{ needs.configure.outputs.username }}
+          echo "${{ needs.configure.outputs.username }} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
       - name: Add AUR SSH key
         uses: shimataro/ssh-key-action@v2
@@ -43,40 +54,10 @@ jobs:
             aur.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDKF9vAFWdgm9Bi8uc+tYRBmXASBb5cB5iZsB7LOWWFeBrLp3r14w0/9S2vozjgqY5sJLDPONWoTTaVTbhe3vwO8CBKZTEt1AcWxuXNlRnk9FliR1/eNB9uz/7y1R0+c1Md+P98AJJSJWKN12nqIDIhjl2S1vOUvm7FNY43fU2knIhEbHybhwWeg+0wxpKwcAd/JeL5i92Uv03MYftOToUijd1pqyVFdJvQFhqD4v3M157jxS5FTOBrccAEjT+zYmFyD8WvKUa9vUclRddNllmBJdy4NyLB8SvVZULUPrP3QOlmzemeKracTlVOUG1wsDbxknF1BwSCU7CmU6UFP90kpWIyz66bP0bl67QAvlIc52Yix7pKJPbw85+zykvnfl2mdROsaT8p8R9nwCdFsBc9IiD0NhPEHcyHRwB8fokXTajk2QnGhL+zP5KnkmXnyQYOCUYo3EKMXIlVOVbPDgRYYT/XqvBuzq5S9rrU70KoI/S5lDnFfx/+lPLdtcnnEPk=
             aur.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLMiLrP8pVi5BFX2i3vepSUnpedeiewE5XptnUnau+ZoeUOPkpoCgZZuYfpaIQfhhJJI5qgnjJmr4hyJbe/zxow=
 
-      - name: Bump AUR Package (usql)
-        run: |
-          export WORKDIR=$(mktemp -d /tmp/aur-usql.XXXXXX)
-          export REPO_PATH=$WORKDIR/aur-usql
-          export CHANGELOG=$(
-            curl \
-              -s \
-              -H 'Accept: application/vnd.github+json' \
-              https://api.github.com/repos/xo/usql/releases/tags/$VER \
-              |jq -r .body \
-              |sed -e 's/\\r//g' -e 's/\[VirusTotal.*//'
-          )
-          git clone $AUR_REPO $REPO_PATH
-          git -C $REPO_PATH config user.name "$AUTHOR_NAME"
-          git -C $REPO_PATH config user.email "$AUTHOR_EMAIL"
-          sed -i "s/pkgver=.*$/pkgver=${VER#v}/" $REPO_PATH/PKGBUILD
-          sed -i "s/sha256sums=.*$/sha256sums=('SKIP')/" $REPO_PATH/PKGBUILD
-          sed -i "s/pkgrel=.*$/pkgrel=1/" $REPO_PATH/PKGBUILD
-          pushd $REPO_PATH &> /dev/null
-          sudo -u ${{ needs.configure.outputs.username }} bash << 'EOF'
-            updpkgsums
-          EOF
-          pkgctl build
-          du -sh *.zst
-          popd &> /dev/null
-          git -C $REPO_PATH add PKGBUILD .SRCINFO
-          git -C $REPO_PATH commit -m "$(printf %b "Update usql version to ${VER}\n\n${CHANGELOG}")"
-          git -C $REPO_PATH show -C
-          git -C $REPO_PATH push origin master
-
-      - name: Bump AUR Package (usql-bin)
+      - name: Bump AUR Package (${{ matrix.package }})
         run: |
-          export WORKDIR=$(mktemp -d /tmp/aur-usql-bin.XXXXXX)
-          export REPO_PATH=$WORKDIR/aur-usql-bin
+          export WORKDIR=$(mktemp -d /tmp/${{ matrix.package }}.XXXXXX)
+          export REPO_PATH=$WORKDIR/${{ matrix.package }}
           export CHANGELOG=$(
             curl \
               -s \
@@ -85,17 +66,18 @@ jobs:
               |jq -r .body \
               |sed -e 's/\\r//g' -e 's/\[VirusTotal.*//'
           )
-          git clone $AUR_BIN_REPO $REPO_PATH
+          git clone ${{ matrix.repo }} $REPO_PATH
           git -C $REPO_PATH config user.name "$AUTHOR_NAME"
           git -C $REPO_PATH config user.email "$AUTHOR_EMAIL"
           sed -i "s/pkgver=.*$/pkgver=${VER#v}/" $REPO_PATH/PKGBUILD
           sed -i "s/sha256sums\\([^=]*\\)=.*$/sha256sums\\1=('SKIP')/" $REPO_PATH/PKGBUILD
           sed -i "s/pkgrel=.*$/pkgrel=1/" $REPO_PATH/PKGBUILD
           pushd $REPO_PATH &> /dev/null
+          chown -R ${{ needs.configure.outputs.username }} .
           sudo -u ${{ needs.configure.outputs.username }} bash << 'EOF'
             updpkgsums
+            pkgctl build
           EOF
-          pkgctl build
           du -sh *.zst
           popd &> /dev/null
           git -C $REPO_PATH add PKGBUILD .SRCINFO