fix

1 files changed, 32 insertions, 17 deletions

diff --git a/.forgejo/workflows/kernel-update-check.yml b/.forgejo/workflows/kernel-update-check.yml
index 1eb42c6..5e7e16d 100644
--- a/.forgejo/workflows/kernel-update-check.yml
+++ b/.forgejo/workflows/kernel-update-check.yml
@@ -5,6 +5,10 @@ on:
     - cron: '0 6 1,15 * *'
   workflow_dispatch:
 
+concurrency:
+  group: kernel-update-check
+  cancel-in-progress: false
+
 jobs:
   check-update:
     runs-on: iso-builder
@@ -29,6 +33,11 @@ jobs:
             echo "HIBA: Nem sikerult a CachyOS verziot lekerdezni"
             exit 1
           fi
+          for v in "$MAJOR" "$MINOR" "$TAGREL"; do
+            case "$v" in
+              *[!0-9]*) echo "HIBA: Ervenytelen verzio: $v"; exit 1 ;;
+            esac
+          done
           echo "MAJOR=$MAJOR" >> $GITHUB_OUTPUT
           echo "MINOR=$MINOR" >> $GITHUB_OUTPUT
           echo "TAGREL=$TAGREL" >> $GITHUB_OUTPUT
@@ -50,10 +59,17 @@ jobs:
 
       - name: Frissites szukseges?
         id: needsupdate
+        env:
+          NEW_MAJOR: ${{ steps.check.outputs.MAJOR }}
+          NEW_MINOR: ${{ steps.check.outputs.MINOR }}
+          NEW_TAGREL: ${{ steps.check.outputs.TAGREL }}
+          CUR_MAJOR: ${{ steps.current.outputs.MAJOR }}
+          CUR_MINOR: ${{ steps.current.outputs.MINOR }}
+          CUR_TAGREL: ${{ steps.current.outputs.TAGREL }}
         run: |
           set -euo pipefail
-          NEW="${{ steps.check.outputs.MAJOR }}.${{ steps.check.outputs.MINOR }}-${{ steps.check.outputs.TAGREL }}"
-          CUR="${{ steps.current.outputs.MAJOR }}.${{ steps.current.outputs.MINOR }}-${{ steps.current.outputs.TAGREL }}"
+          NEW="${NEW_MAJOR}.${NEW_MINOR}-${NEW_TAGREL}"
+          CUR="${CUR_MAJOR}.${CUR_MINOR}-${CUR_TAGREL}"
           if [ "$NEW" != "$CUR" ]; then
             echo "UPDATE=yes" >> $GITHUB_OUTPUT
             echo "Frissites: $CUR -> $NEW"
@@ -65,9 +81,13 @@ jobs:
       - name: PR mar letezik?
         id: prcheck
         if: steps.needsupdate.outputs.UPDATE == 'yes'
+        env:
+          NEW_MAJOR: ${{ steps.check.outputs.MAJOR }}
+          NEW_MINOR: ${{ steps.check.outputs.MINOR }}
+          NEW_TAGREL: ${{ steps.check.outputs.TAGREL }}
         run: |
           set -euo pipefail
-          BRANCH="update/kernel-${{ steps.check.outputs.MAJOR }}.${{ steps.check.outputs.MINOR }}-${{ steps.check.outputs.TAGREL }}"
+          BRANCH="update/kernel-${NEW_MAJOR}.${NEW_MINOR}-${NEW_TAGREL}"
           OPEN_PRS=$(curl -fsSL \
             -H "Authorization: token ${{ secrets.FORGEJO_TOKEN }}" \
             "https://git.rp1.hu/api/v1/repos/${{ github.repository }}/pulls?state=open&limit=50")
@@ -83,23 +103,20 @@ jobs:
 
       - name: PKGBUILD frissitese es PR nyitasa
         if: steps.needsupdate.outputs.UPDATE == 'yes' && steps.prcheck.outputs.EXISTS == 'no'
+        env:
+          NEW_MAJOR: ${{ steps.check.outputs.MAJOR }}
+          NEW_MINOR: ${{ steps.check.outputs.MINOR }}
+          NEW_TAGREL: ${{ steps.check.outputs.TAGREL }}
+          OLD_PKGVER: ${{ steps.current.outputs.PKGVER }}
+          OLD_MAJOR: ${{ steps.current.outputs.MAJOR }}
+          OLD_MINOR: ${{ steps.current.outputs.MINOR }}
+          OLD_TAGREL: ${{ steps.current.outputs.TAGREL }}
         run: |
           set -euo pipefail
 
-          NEW_MAJOR="${{ steps.check.outputs.MAJOR }}"
-          NEW_MINOR="${{ steps.check.outputs.MINOR }}"
-          NEW_TAGREL="${{ steps.check.outputs.TAGREL }}"
-          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 logika:
-          #   - uj major.minor (pl. 7.0.10 -> 7.0.11 vagy 8.0.x) -> reset 10-re
-          #   - csak _tagrel valtozik (ugyanaz a kernel, uj stable tag) -> +1
+          CUR="${OLD_MAJOR}.${OLD_MINOR}-${OLD_TAGREL}"
           NEW_PKGVER="${NEW_MAJOR}.${NEW_MINOR}"
 
-          OLD_MAJOR="${{ steps.current.outputs.MAJOR }}"
-          OLD_MINOR="${{ steps.current.outputs.MINOR }}"
           OLD_PKGREL=$(grep '^pkgrel=' linux-raveos/PKGBUILD | cut -d= -f2)
 
           if [ "${OLD_MAJOR}.${OLD_MINOR}" != "${NEW_MAJOR}.${NEW_MINOR}" ]; then
@@ -122,7 +139,6 @@ jobs:
           sed -i "s/^pkgver=.*/pkgver=${NEW_PKGVER}/" linux-raveos/PKGBUILD
           sed -i "s/^pkgrel=.*/pkgrel=${NEW_PKGREL}/" linux-raveos/PKGBUILD
 
-          # Uj CachyOS config letoltese + RaveOS javitasok visszarakasa
           curl -fsSL --retry 3 \
             "https://raw.githubusercontent.com/CachyOS/linux-cachyos/master/linux-cachyos/config" \
             -o linux-raveos/config
@@ -134,7 +150,6 @@ jobs:
           git add linux-raveos/PKGBUILD linux-raveos/config
           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"
 
           curl -fsSL -X POST \