diff options
| -rw-r--r-- | .forgejo/workflows/kernel-update-check.yml | 13 | ||||
| -rw-r--r-- | linux-raveos/PKGBUILD | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/.forgejo/workflows/kernel-update-check.yml b/.forgejo/workflows/kernel-update-check.yml index 6f949c3..fb6210f 100644 --- a/.forgejo/workflows/kernel-update-check.yml +++ b/.forgejo/workflows/kernel-update-check.yml @@ -92,9 +92,16 @@ jobs: OLD_PKGVER="${{ steps.current.outputs.PKGVER }}" CUR="${{ steps.current.outputs.MAJOR }}.${{ steps.current.outputs.MINOR }}-${{ steps.current.outputs.TAGREL }}" - # pkgver = kernel verzio (pl. 7.0.11), pkgrel mindig 20 + # pkgver = kernel verzio (pl. 7.0.11), pkgrel auto-increment (min 10) NEW_PKGVER="${NEW_MAJOR}.${NEW_MINOR}" + OLD_PKGREL=$(grep '^pkgrel=' linux-raveos/PKGBUILD | cut -d= -f2) + if [ "$OLD_PKGREL" -lt 10 ]; then + NEW_PKGREL=10 + else + NEW_PKGREL=$((OLD_PKGREL + 1)) + fi + BRANCH="update/kernel-${NEW_MAJOR}.${NEW_MINOR}-${NEW_TAGREL}" git config user.name "RaveOS Bot" @@ -105,7 +112,7 @@ jobs: sed -i "s/^_minor=.*/_minor=${NEW_MINOR}/" linux-raveos/PKGBUILD sed -i "s/^_tagrel=.*/_tagrel=${NEW_TAGREL}/" linux-raveos/PKGBUILD sed -i "s/^pkgver=.*/pkgver=${NEW_PKGVER}/" linux-raveos/PKGBUILD - sed -i "s/^pkgrel=.*/pkgrel=20/" linux-raveos/PKGBUILD + sed -i "s/^pkgrel=.*/pkgrel=${NEW_PKGREL}/" linux-raveos/PKGBUILD # Uj CachyOS config letoltese + RaveOS javitasok visszarakasa curl -fsSL --retry 3 \ @@ -117,7 +124,7 @@ jobs: sed -i 's/^# CONFIG_NTSYNC is not set$/CONFIG_NTSYNC=y/' linux-raveos/config git add linux-raveos/PKGBUILD linux-raveos/config - git commit -m "update: linux-cachyos ${NEW_MAJOR}.${NEW_MINOR}-${NEW_TAGREL} (pkgver=${NEW_PKGVER}-20)" + git commit -m "update: linux-cachyos ${NEW_MAJOR}.${NEW_MINOR}-${NEW_TAGREL} (pkgver=${NEW_PKGVER}-${NEW_PKGREL})" git remote set-url origin "https://bot:${{ secrets.FORGEJO_TOKEN }}@git.rp1.hu/RaveOS/RaveOS-PKGBUILD.git" git push origin "$BRANCH" diff --git a/linux-raveos/PKGBUILD b/linux-raveos/PKGBUILD index d7e27d4..9ccb4a2 100644 --- a/linux-raveos/PKGBUILD +++ b/linux-raveos/PKGBUILD @@ -82,7 +82,7 @@ _minor=10 _tagrel=2 _srcname=cachyos-${_major}.${_minor}-${_tagrel} pkgver=7.0.10 -pkgrel=20 +pkgrel=10 pkgdesc='Linux BORE + NTSYNC + Memory Optimized RaveOS Kernel based on CachyOS' _kernver="$pkgver-$pkgrel" _kernuname="${_major}.${_minor}-${_pkgsuffix}" |