Skip to content

Commit 565e02c

Browse files
committed
fix workflow
1 parent 25ad603 commit 565e02c

2 files changed

Lines changed: 4 additions & 18 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,12 @@ jobs:
7979
curl -LfsSo ${{ env.TARBALL }} "https://github.com/${{ env.REPOSITORY }}/archive/refs/tags/${{ env.RELEASE_TAG }}.tar.gz"
8080
mkdir tarball
8181
tar -xzf ${{ env.TARBALL }} -C tarball
82+
mv -vf tarball/bato-* tarball/bato
8283
- name: Get app version
8384
id: app-version
8485
uses: nicolaiunrein/cargo-get@master
8586
with:
86-
subcommand: package.version --entry="tarball/bato-${{ env.RELEASE_TAG }}/Cargo.toml"
87+
subcommand: package.version --entry=tarball/bato/Cargo.toml
8788
- name: Update PKGBUILD
8889
env:
8990
PKGBUILD: ${{ env.PKGBUILD }}
@@ -94,9 +95,9 @@ jobs:
9495
- name: Publish
9596
uses: KSXGitHub/github-actions-deploy-aur@v4.1.1
9697
with:
97-
pkgname: ${{ env.PKG_NAME }}
98+
pkgname: ${{ env.PKGNAME }}
9899
pkgbuild: ${{ env.PKGBUILD }}
99100
commit_username: ${{ secrets.AUR_USERNAME }}
100101
commit_email: ${{ secrets.AUR_EMAIL }}
101102
ssh_private_key: ${{ secrets.AUR_SSH_KEY }}
102-
commit_message: ${{ github.ref_name }}
103+
commit_message: ${{ format('v{0}', steps.app-version.outputs.metadata) }}

.pkg/aur/update.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,11 @@ if [ -z "$PKGVER" ]; then
1414
exit 1
1515
fi
1616

17-
if [ -z "$PKGNAME" ]; then
18-
echo >&2 " ✕ PKGNAME not set"
19-
exit 1
20-
fi
21-
2217
if [ -z "$TARBALL" ]; then
2318
echo >&2 " ✕ TARBALL not set"
2419
exit 1
2520
fi
2621

27-
if [ -z "$RELEASE_TAG" ]; then
28-
echo >&2 " ✕ RELEASE_TAG not set"
29-
exit 1
30-
fi
31-
3222
if ! [ -a "$PKGBUILD" ]; then
3323
echo >&2 " ✕ no such file $PKGBUILD"
3424
exit 1
@@ -39,11 +29,6 @@ if ! [ -a "$TARBALL" ]; then
3929
exit 1
4030
fi
4131

42-
if ! [[ "$RELEASE_TAG" =~ ^v.*? ]]; then
43-
echo >&2 " ✕ invalid tag $RELEASE_TAG"
44-
exit 1
45-
fi
46-
4732
# ⚠ Dashes are not allowed in package version, replace any - by _
4833
pkgver=${PKGVER//-/_}
4934

0 commit comments

Comments
 (0)