Skip to content

Commit 13f8be7

Browse files
committed
Fixing announce workflow
1 parent caf2cf9 commit 13f8be7

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

.github/workflows/announce.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@ jobs:
3838
steps:
3939
- name: Setup
4040
run: |
41+
export USERNAME=${{ needs.configure.outputs.username }}
4142
pacman-key --init
4243
pacman -Sy --noconfirm archlinux-keyring
4344
pacman -Sy --noconfirm git base-devel sudo pacman-contrib devtools
44-
useradd -m ${{ needs.configure.outputs.username }}
45-
echo "${{ needs.configure.outputs.username }} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
45+
useradd -m $USERNAME
46+
echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
4647
4748
- name: Add AUR SSH key
4849
uses: shimataro/ssh-key-action@v2
@@ -56,8 +57,11 @@ jobs:
5657
5758
- name: Bump AUR Package (${{ matrix.package }})
5859
run: |
59-
export WORKDIR=$(mktemp -d /tmp/${{ matrix.package }}.XXXXXX)
60-
export REPO_PATH=$WORKDIR/${{ matrix.package }}
60+
export USERNAME=${{ needs.configure.outputs.username }}
61+
export PACKAGE=${{ matrix.package }}
62+
export REPO=${{ matrix.repo }}
63+
export WORKDIR=$(mktemp -d /tmp/${PACKAGE}.XXXXXX)
64+
export REPO_PATH=$WORKDIR/${PACKAGE}
6165
export CHANGELOG=$(
6266
curl \
6367
-s \
@@ -66,19 +70,16 @@ jobs:
6670
|jq -r .body \
6771
|sed -e 's/\\r//g' -e 's/\[VirusTotal.*//'
6872
)
69-
git clone ${{ matrix.repo }} $REPO_PATH
73+
git clone $REPO $REPO_PATH
7074
git -C $REPO_PATH config user.name "$AUTHOR_NAME"
7175
git -C $REPO_PATH config user.email "$AUTHOR_EMAIL"
7276
sed -i "s/pkgver=.*$/pkgver=${VER#v}/" $REPO_PATH/PKGBUILD
7377
sed -i "s/sha256sums\\([^=]*\\)=.*$/sha256sums\\1=('SKIP')/" $REPO_PATH/PKGBUILD
7478
sed -i "s/pkgrel=.*$/pkgrel=1/" $REPO_PATH/PKGBUILD
79+
chown -R ${USERNAME}:${USERNAME} $WORKDIR
7580
pushd $REPO_PATH &> /dev/null
76-
chown -R ${{ needs.configure.outputs.username }} .
77-
sudo -u ${{ needs.configure.outputs.username }} bash << 'EOF'
78-
updpkgsums
79-
EOF
80-
pkgctl build
81-
du -sh *.zst
81+
sudo -u ${USERNAME} bash -c 'updpkgsums'
82+
sudo -u ${USERNAME} bash -c 'makepkg --printsrcinfo > .SRCINFO'
8283
popd &> /dev/null
8384
git -C $REPO_PATH add PKGBUILD .SRCINFO
8485
git -C $REPO_PATH commit -m "$(printf %b "Update usql version to ${VER}\n\n${CHANGELOG}")"

0 commit comments

Comments
 (0)