apk: push version*

fantastic-packages · Dec 5, 2024 · 8e3459f · 8e3459f
1 parent 10c14a8
commit 8e3459f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/AutoBuild.yml b/.github/workflows/AutoBuild.yml
@@ -59,7 +59,7 @@ jobs:
       contents: write  # To push a branch
     strategy:
       matrix:
-        version: [23.05.5, 24.10.0-rc2]
+        version: [SNAPSHOT]
         arch_packages: [
           x86_64,
           aarch64_cortex-a53,
@@ -124,7 +124,7 @@ jobs:
       - name: Move artifact
         shell: bash
         env:
-          keepdir: '22.03|23.05'
+          keepdir: '23.05|24.10'
         run: |
           if [ "$DELETE_OLD_PACKAGES" == "true" ]; then
             find $release_path/* -maxdepth 0 -type d 2>/dev/null | grep -Ev "\b($keepdir)$" | xargs -I{} rm -rf "{}"
@@ -146,8 +146,8 @@ jobs:
           #git checkout -B $Branch refs/remotes/origin/$Branch
           git add $release_path/**/
           git reset HEAD $release_path/**/targets/
-          git diff-index --cached --quiet HEAD $release_path/**/packages/**/*.ipk \
-          && git diff-index --cached --quiet HEAD $release_path/**/packages/**/Packages.manifest \
+          git diff-index --cached --quiet HEAD $release_path/**/packages/**/*.{ipk,apk} \
+          && git diff-index --cached --quiet HEAD $release_path/**/packages/**/packages.adb \
           && git diff-index --cached --quiet HEAD $release_path/**/*.pub \
           || (git commit -m "Update packages" && git push)
 

diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -276,8 +276,8 @@ jobs:
           done
           endgroup
           #
-          group "make package/index"
-          make package/index
+          group "make package/index V=s"
+          make package/index V=s
           endgroup
           # Build done
           popd
@@ -327,8 +327,8 @@ jobs:
         run: |
           sign_packages() {
             # gpg
-            if [ "${{env.GPG_SIGN}}" == "true" ]; then
-              gpg -u ${GPG_ID} --batch --pinentry-mode=loopback --yes --passphrase "$(echo -n "${GPG_PW}")" -a -o Packages.asc --detach-sign Packages
+            if [ "${{env.GPG_SIGN}}" == "true" -a -f packages.adb ]; then
+              gpg -u ${GPG_ID} --batch --pinentry-mode=loopback --yes --passphrase "$(echo -n "${GPG_PW}")" -a -o packages.adb.asc --detach-sign packages.adb
             fi
           }
           #
@@ -403,9 +403,9 @@ jobs:
           ARTIFACTS_DIR: /workdir
           REPO_DIR: /workdir/bin/packages/${{ inputs.ARCH }}
           EXTRA_REPOS: >-
-            src|${{ env.FTSPKGPREFIX }}packages|file:///repo/${{ env.FTSPKGPREFIX }}packages
-            src|${{ env.FTSPKGPREFIX }}luci|file:///repo/${{ env.FTSPKGPREFIX }}luci
-            src|${{ env.FTSPKGPREFIX }}special|file:///repo/${{ env.FTSPKGPREFIX }}special
+            file:///repo/${{ env.FTSPKGPREFIX }}packages/packages.adb
+            file:///repo/${{ env.FTSPKGPREFIX }}luci/packages.adb
+            file:///repo/${{ env.FTSPKGPREFIX }}special/packages.adb
           NO_LOCAL_REPOS: 1
           KEY_BUILD: ${{ env.APK_SIGN_KEY }}
           KEY_BUILD_PUB: ${{ env.APK_SIGN_PUBKEY }}

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Choose one of the following methods:
 umask 022
 git clone --branch master --single-branch --no-tags --recurse-submodules https://github.com/fantastic-packages/packages.git fantastic_packages
 cd fantastic_packages
-for v in master 22.03 23.05 24.10; do
+for v in master 23.05 24.10 25.??; do
 	git remote set-branches --add origin $v
 	git fetch origin $v
 	git branch --track $v origin/$v