update gh workflow

Author: doums

.github/workflows/deploy.yml

@@ -22,8 +22,6 @@ jobs:
         uses: actions/checkout@v5
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
-      - name: Install system dependencies
-        run: sudo apt-get install libnotify-dev
       - name: Build
         run: cargo build --release --locked
       - name: Prepare artifact
@@ -72,12 +70,24 @@ jobs:
       PKGBUILD: ./.pkg/aur/PKGBUILD
       RELEASE_TAG: ${{ github.ref_name }}
       REPOSITORY: ${{ github.repository }}
+      TARBALL: sources.tar.gz
     steps:
       - name: Checkout
         uses: actions/checkout@v5
       - name: Download sources
-        run: curl -LfsSo "$PKGNAME-$RELEASE_TAG".tar.gz "https://github.com/$REPOSITORY/archive/refs/tags/$RELEASE_TAG.tar.gz"
+        run: |
+          curl -LfsSo ${{ env.TARBALL }} "https://github.com/${{ env.REPOSITORY }}/archive/refs/tags/${{ env.RELEASE_TAG }}.tar.gz"
+          mkdir tarball
+          tar -xzf ${{ env.TARBALL }} -C tarball
+      - name: Get app version
+        id: app-version
+        uses: nicolaiunrein/cargo-get@master
+        with:
+          subcommand: package.version --entry="tarball/bato-${{ env.RELEASE_TAG }}/Cargo.toml"
       - name: Update PKGBUILD
+        env:
+          PKGBUILD: ${{ env.PKGBUILD }}
+          PKGVER: ${{ steps.app-version.outputs.metadata }}
         run: ./.pkg/aur/update.sh
       - name: Show PKGBUILD
         run: cat "$PKGBUILD"

.github/workflows/test.yml

@@ -2,6 +2,7 @@ name: Test
 
 on:
   workflow_call:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -20,10 +21,8 @@ jobs:
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          components: clippy
-      - name: Install libnotify
-        run: sudo apt-get install libnotify-dev
-      - name: Lint
+          components: rustfmt, clippy
+      - name: Clippy
         run: cargo clippy
-      - name: Check
-        run: cargo check
+      - name: Fmt
+        run: cargo fmt --check

.pkg/aur/update.sh

@@ -4,51 +4,56 @@
 
 set -e
 
-red="\e[38;5;1m"
-green="\e[38;5;2m"
-bold="\e[1m"
-reset="\e[0m"
-
 if [ -z "$PKGBUILD" ]; then
-  >&2 printf "  %b%b✕%b PKGBUILD not set\n" "$red" "$bold" "$reset"
+  echo >&2 " ✕ PKGBUILD not set"
+  exit 1
+fi
+
+if [ -z "$PKGVER" ]; then
+  echo >&2 " ✕ PKGVER not set"
   exit 1
 fi
 
 if [ -z "$PKGNAME" ]; then
-  >&2 printf "  %b%b✕%b PKGNAME not set\n" "$red" "$bold" "$reset"
+  echo >&2 " ✕ PKGNAME not set"
+  exit 1
+fi
+
+if [ -z "$TARBALL" ]; then
+  echo >&2 " ✕ TARBALL not set"
   exit 1
 fi
 
 if [ -z "$RELEASE_TAG" ]; then
-  >&2 printf "  %b%b✕%b RELEASE_TAG not set\n" "$red" "$bold" "$reset"
+  echo >&2 " ✕ RELEASE_TAG not set"
   exit 1
 fi
 
 if ! [ -a "$PKGBUILD" ]; then
-  >&2 printf "  %b%b✕%b no such file $PKGBUILD\n" "$red" "$bold" "$reset"
+  echo >&2 " ✕ no such file $PKGBUILD"
   exit 1
 fi
 
-if ! [[ "$RELEASE_TAG" =~ ^v.*? ]]; then
-  >&2 printf "  %b%b✕%b invalid tag $RELEASE_TAG\n" "$red" "$bold" "$reset"
+if ! [ -a "$TARBALL" ]; then
+  echo >&2 " ✕ no such file $TARBALL"
   exit 1
 fi
 
-pkgver="${RELEASE_TAG#v}"
-tarball="$PKGNAME-$RELEASE_TAG".tar.gz
-
-if ! [ -a "$tarball" ]; then
-  >&2 printf "  %b%b✕%b no such file $tarball\n" "$red" "$bold" "$reset"
+if ! [[ "$RELEASE_TAG" =~ ^v.*? ]]; then
+  echo >&2  "  ✕ invalid tag $RELEASE_TAG"
   exit 1
 fi
 
+# ⚠ Dashes are not allowed in package version, replace any - by _
+pkgver=${PKGVER//-/_}
+
 # bump package version
 sed -i "s/pkgver=.*/pkgver=$pkgver/" "$PKGBUILD"
-printf "  %b%b✓%b bump version to $RELEASE_TAG\n" "$green" "$bold" "$reset"
+echo " ✓ bump pkgver to $pkgver"
 
 # generate new checksum
-sum=$(set -o pipefail && sha256sum "$tarball" | awk '{print $1}')
+sum=$(set -o pipefail && sha256sum "$TARBALL" | awk '{print $1}')
 sed -i "s/sha256sums=('.*')/sha256sums=('$sum')/" "$PKGBUILD"
-printf "  %b%b✓%b generated checksum $sum\n" "$green" "$bold" "$reset"
+echo " ✓ updated checksums"
 
 exit 0