Merge pull request #43 from Lessica/copilot/update-release-naming-convention

chore: switch version source from git tag to control file Version field

Author: Lessica

.github/workflows/build-release.yml

@@ -9,7 +9,7 @@ on:
 
 env:
   THEOS: ''
-  GIT_TAG: ''
+  PKG_VERSION: ''
   XCODE_VERSION: '15.4'
 
 jobs:
@@ -60,27 +60,26 @@ jobs:
           echo "Available SDKs: $(find $THEOS/sdks -name "*.sdk" -maxdepth 1 -print)"
           echo "FINALPACKAGE=1" >> $GITHUB_ENV
           cd $GITHUB_WORKSPACE/TrollSpeed
-          git fetch --tags
-          echo "GIT_TAG=$(git describe --tags --always --abbrev=0)" >> $GITHUB_ENV
+          echo "PKG_VERSION=$(./get-version.sh)" >> $GITHUB_ENV
 
       - name: Build package
         run: |
           cd $GITHUB_WORKSPACE/TrollSpeed
-          ./gen-control.sh ${{ env.GIT_TAG }}
-          ./build.sh ${{ env.GIT_TAG }}
+          ./gen-control.sh
+          ./build.sh
           THEOS_PACKAGE_SCHEME=roothide FINALPACKAGE=1 gmake clean package
           THEOS_PACKAGE_SCHEME=rootless FINALPACKAGE=1 gmake clean package
           FINALPACKAGE=1 gmake clean package
 
       - name: Collect symbols
         run: |
           cd $GITHUB_WORKSPACE/TrollSpeed
-          find .theos/obj -name "*.dSYM" -print | zip -r packages/TrollSpeed_${{ env.GIT_TAG }}_symbols.zip -@
+          find .theos/obj -name "*.dSYM" -print | zip -r packages/TrollSpeed_${{ env.PKG_VERSION }}_symbols.zip -@
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: TrollSpeed_${{ env.GIT_TAG }}
+          name: TrollSpeed_${{ env.PKG_VERSION }}
           path: |
             TrollSpeed/packages/TrollSpeed_*.tipa
             TrollSpeed/packages/TrollSpeed+AppIntents16_*.tipa
@@ -89,9 +88,9 @@ jobs:
       - name: Upload symbols
         uses: actions/upload-artifact@v4
         with:
-          name: TrollSpeed_${{ env.GIT_TAG }}_symbols
+          name: TrollSpeed_${{ env.PKG_VERSION }}_symbols
           path: |
-            TrollSpeed/packages/TrollSpeed_${{ env.GIT_TAG }}_symbols.zip
+            TrollSpeed/packages/TrollSpeed_${{ env.PKG_VERSION }}_symbols.zip
 
       - name: Upload release
         uses: softprops/action-gh-release@v1

build.sh

@@ -1,15 +1,11 @@
 #!/bin/sh
 
 # This script is used to build the TrollSpeed app and create a tipa file with Xcode.
-if [ $# -ne 1 ]; then
-    echo "Usage: $0 <version>"
-    exit 1
-fi
 
-VERSION=$1
+# Read the version from the existing control file
+VERSION=$(./get-version.sh) || exit 1
 
-# Strip leading "v" from version if present
-VERSION=${VERSION#v}
+echo "Using version: $VERSION"
 
 # Set GITHUB_WORKSPACE to home directory if not set
 if [ -z "$GITHUB_WORKSPACE" ]; then

gen-control.sh

@@ -1,34 +1,11 @@
 #!/bin/sh
 
 # This script is used to generate the control file for the Debian package.
-if [ $# -ne 1 ]; then
-    echo "Usage: $0 <version>"
-    exit 1
-fi
 
-VERSION=$1
+# Read the version from the existing control file
+VERSION=$(./get-version.sh) || exit 1
 
-# Strip leading "v" from version if present
-VERSION=${VERSION#v}
-
-# Create the layout directory
-mkdir -p layout/DEBIAN
-
-# Write the control file
-cat > layout/DEBIAN/control << __EOF__
-Package: ch.xxtou.hudapp.jb
-Name: TrollSpeed JB
-Version: $VERSION
-Section: Tweaks
-Depends: firmware (>= 14.0)
-Architecture: iphoneos-arm
-Author: Lessica <82flex@gmail.com>
-Maintainer: Lessica <82flex@gmail.com>
-Description: Troll your speed, but jailbroken.
-__EOF__
-
-# Set permissions
-chmod 0644 layout/DEBIAN/control
+echo "Using version: $VERSION"
 
 RAND_BUILD_STR=$(openssl rand -hex 4)
 

get-version.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# This script reads the package version from layout/DEBIAN/control.
+VERSION=$(grep -m1 '^Version:' layout/DEBIAN/control | awk '{print $2}' | tr -d '[:space:]')
+
+if [ -z "$VERSION" ]; then
+    echo "Error: Could not read Version from layout/DEBIAN/control" >&2
+    exit 1
+fi
+
+echo "$VERSION"