Skip to content

Commit 8e13e8a

Browse files
committed
fix(script): handle pkgver only
fix(workflow): use updpkgsums chore(release): update to 0.2.7
1 parent aaa105d commit 8e13e8a

4 files changed

Lines changed: 21 additions & 50 deletions

File tree

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
run: |
115115
rm -rf artifacts/
116116
cargo publish --allow-dirty --token ${{ secrets.CRATES_IO_TOKEN }}
117-
- name: 🔒 Update PKGBUILD sha256 checksums and pkgver
117+
- name: 🔒 Update PKGBUILD pkgver
118118
run: |
119119
cd ci
120120
./pkgbuild-ci.sh
@@ -124,6 +124,7 @@ jobs:
124124
with:
125125
pkgname: getquotes
126126
pkgbuild: ./packages/aur/getquotes/PKGBUILD
127+
updpkgsums: true,
127128
commit_username: ${{ secrets.AUR_USERNAME }}
128129
commit_email: ${{ secrets.AUR_EMAIL }}
129130
ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
@@ -133,6 +134,7 @@ jobs:
133134
run: |
134135
docker pull quay.io/git-chglog/git-chglog:latest
135136
docker run -v "$PWD":/workdir quay.io/git-chglog/git-chglog -o CHANGELOG.md
137+
git remote remove origin
136138
git remote add origin https://github.com/MuntasirSZN/getquotes.git
137139
- name: 💫 Commit Changelog And PKGBUILD
138140
uses: EndBug/add-and-commit@v9

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "getquotes"
3-
version = "0.2.6"
3+
version = "0.2.7"
44
edition = "2021"
55
authors = ["MuntasirSZN <muntasir.joypurhat@gmail.com>"]
66
description = "A command line tool to get quotes from the WikiQuotes"

ci/pkgbuild-ci.sh

Lines changed: 13 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,53 +3,24 @@
33
# Exit on any error
44
set -e
55

6-
# Temporary directory to store downloaded files
7-
TMPDIR=$(mktemp -d)
8-
trap 'rm -rf "$TMPDIR"' EXIT
9-
10-
# Fetch the latest Git tag and update pkgver
6+
# Fetch the latest tag from the repository
117
LATEST_TAG=$(git ls-remote --tags https://github.com/MuntasirSZN/getquotes.git | grep -oP 'tags/v?\K([0-9]+(\.[0-9]+)+)' | sort -V | tail -n 1)
128

139
if [[ -z "$LATEST_TAG" ]]; then
14-
echo "No Git tags found. pkgver was not updated."
15-
exit 1
10+
echo "No Git tags found. pkgver was not updated."
11+
exit 1
1612
fi
1713

18-
# Escape special characters for sed
19-
LATEST_TAG_ESC=$(echo "$LATEST_TAG" | sed 's/[\/&]/\\&/g')
20-
21-
# Update the PKGBUILD
22-
sed -i "s/^pkgver=.*/pkgver=$LATEST_TAG_ESC/" ../packages/aur/getquotes/PKGBUILD
23-
echo "Updated pkgver to $LATEST_TAG in PKGBUILD."
24-
25-
# Read the updated pkgver from PKGBUILD
26-
PKGVER=$(sed -n 's/^pkgver=//p' ../packages/aur/getquotes/PKGBUILD)
14+
# Read current pkgver from PKGBUILD
15+
CURRENT_PKGVER=$(sed -n 's/^pkgver=//p' ../packages/aur/getquotes/PKGBUILD)
2716

28-
# Read source array from PKGBUILD
29-
mapfile -t SOURCES < <(sed -n '/^source=(/,/^)/ { /^source=(/d; /^)/d; /^[[:space:]]*#/d; s/^[[:space:]]*"\([^"]*\)".*$/\1/; p }' ../packages/aur/getquotes/PKGBUILD)
30-
31-
# Download files and calculate sha256sums
32-
declare -A SUMS
33-
for URL in "${SOURCES[@]}"; do
34-
FILE=$(basename "$URL")
35-
curl -L -o "$TMPDIR/$FILE" "$URL"
36-
SUM=$(sha256sum "$TMPDIR/$FILE" | awk '{print $1}')
37-
SUMS["$URL"]=$SUM
38-
done
39-
40-
# Read existing sha256sums from PKGBUILD with quotes
41-
mapfile -t OLD_SUMS_QUOTED < <(sed -n '/^sha256sums=(/,/^)/ { /^sha256sums=(/d; /^)/d; /^[[:space:]]*#/d; s/^[[:space:]]*"\([^"]*\)".*$/"\1"/; p }' ../packages/aur/getquotes/PKGBUILD)
17+
# Check if pkgver is already up to date
18+
if [[ "$CURRENT_PKGVER" == "$LATEST_TAG" ]]; then
19+
echo "pkgver is already up to date: $CURRENT_PKGVER"
20+
exit 0
21+
fi
4222

43-
# Replace old sums with new sums, preserving quotes
44-
for i in "${!SOURCES[@]}"; do
45-
URL="${SOURCES[$i]}"
46-
NEW_SUM="${SUMS[$URL]}"
47-
OLD_SUM_QUOTED="${OLD_SUMS_QUOTED[$i]}"
48-
# Escape special characters for sed
49-
OLD_SUM_ESC=$(echo "$OLD_SUM_QUOTED" | sed 's/[\/&]/\\&/g')
50-
NEW_SUM_ESC=$(echo "\"$NEW_SUM\"" | sed 's/[\/&]/\\&/g')
51-
# Update the PKGBUILD
52-
sed -i "s/$OLD_SUM_ESC/$NEW_SUM_ESC/" ../packages/aur/getquotes/PKGBUILD
53-
done
23+
# Update pkgver in PKGBUILD
24+
sed -i "s/^pkgver=.*/pkgver=$LATEST_TAG/" ../packages/aur/getquotes/PKGBUILD
5425

55-
echo "SHA256 sums and pkgver have been updated in PKGBUILD."
26+
echo "Updated pkgver to $LATEST_TAG in PKGBUILD."

packages/aur/getquotes/PKGBUILD

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Maintainer: MuntasirSZN <muntasir.joypurhat@gmail.com>
22
pkgname=getquotes
3-
pkgver=0.2.4
3+
pkgver=0.2.6
44
pkgrel=1
55
pkgdesc="A simple command-line tool to fetch random quotes (pre-built binary)."
66
arch=('x86_64')
@@ -11,11 +11,9 @@ source=(
1111
"https://raw.githubusercontent.com/MuntasirSZN/getquotes/refs/heads/main/LICENSE"
1212
"https://raw.githubusercontent.com/MuntasirSZN/getquotes/refs/heads/main/man/getquotes.1"
1313
)
14-
sha256sums=(
15-
"0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5"
16-
"87f2cb73fde60ac0cfb5f572dd813a1199d542400e0e256299be5c51e3ca910f"
17-
"f06280ea00ff505eafdc7eb77d9e0719875348463a604d882884efc278f98c0d"
18-
)
14+
sha256sums=('027f3ec17620ef8e68fd2a4314f5783fc728bc58a5e8d213f634b90860917e81'
15+
'87f2cb73fde60ac0cfb5f572dd813a1199d542400e0e256299be5c51e3ca910f'
16+
'863c1f303344aa3c6abe2af1a3968e5d811d3b646d65e68ac185f10511daa63a')
1917

2018
package() {
2119
cd "$srcdir"

0 commit comments

Comments
 (0)