fix: version logic + re-enable builds for noble & jammy

RandomCoderOrg · Dec 19, 2024 · 96b04a9 · 96b04a9
1 parent 1e13494
commit 96b04a9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/.github/workflows/anchor-build-and-release.yml b/.github/workflows/anchor-build-and-release.yml
@@ -61,14 +61,20 @@ jobs:
           udroid_version=$(git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' \
               https://github.com/RandomCoderOrg/ubuntu-on-android \
               | tail -n1 | cut -d / -f 3 | cut -d v -f 2- )
-
-          udroid_download=$(
-            git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' \
-              https://github.com/RandomCoderOrg/udroid-download \
-              | tail -n1 | cut -d / -f 3
-            )
-
-          echo "VERSIONTAG=V${udroid_version}${BUILD_TYPE}R$((${udroid_download: -2} + 1))" >> $GITHUB_ENV
+      
+          latest_tag=$(git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' \
+            https://github.com/RandomCoderOrg/udroid-download \
+            | tail -n1 | cut -d / -f 3)
+
+          if [[ $latest_tag =~ R([0-9]+)$ ]]; then
+            current_release=${BASH_REMATCH[1]}
+          else
+            current_release=0
+          fi
+
+          next_release=$((current_release + 1))
+
+          echo "VERSIONTAG=V${udroid_version}ABR${next_release}" >> $GITHUB_ENV
 
       - name: 📝 Generate Release Notes
         run: sudo bash /home/runner/work/udroid-download/udroid-download/.github/scripts/generate-release-notes.sh

diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
@@ -68,14 +68,20 @@ jobs:
           udroid_version=$(git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' \
               https://github.com/RandomCoderOrg/ubuntu-on-android \
               | tail -n1 | cut -d / -f 3 | cut -d v -f 2- )
-
-          udroid_download=$(
-            git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' \
-              https://github.com/RandomCoderOrg/udroid-download \
-              | tail -n1 | cut -d / -f 3
-            )
-
-          echo "VERSIONTAG=V${udroid_version}${BUILD_TYPE}R$((${udroid_download: -2} + 1))" >> $GITHUB_ENV
+      
+          latest_tag=$(git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' \
+            https://github.com/RandomCoderOrg/udroid-download \
+            | tail -n1 | cut -d / -f 3)
+
+          if [[ $latest_tag =~ R([0-9]+)$ ]]; then
+            current_release=${BASH_REMATCH[1]}
+          else
+            current_release=0
+          fi
+
+          next_release=$((current_release + 1))
+
+          echo "VERSIONTAG=V${udroid_version}ABR${next_release}" >> $GITHUB_ENV
 
       - name: 📝 Generate Release Notes
         run: sudo bash /home/runner/work/udroid-download/udroid-download/.github/scripts/generate-release-notes.sh

diff --git a/suites/jammy/.no-matrix-build b/suites/jammy/.no-matrix-build
diff --git a/suites/noble/.no-matrix-build b/suites/noble/.no-matrix-build