Merge pull request #14 from soumyaDghosh/master

snapcrafters · Jan 7, 2024 · d6140ac · d6140ac
2 parents f70a870 + 2966ef5
commit d6140ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml
@@ -22,5 +22,5 @@ jobs:
         with:
           token: ${{ secrets.SNAPCRAFTERS_BOT_COMMIT }}
           update-script: |
-            version="$(git ls-remote --refs --sort='v:refname' --tags https://github.com/axel-download-accelerator/axel.git | tail --lines=1 | cut --delimiter='/' --fields=3)"
-            sed -i 's/^\(source-tag: \).*$/\1'"\"$version\""'/' snap/snapcraft.yaml
+            version="$(git ls-remote --refs --sort='v:refname' --tags https://github.com/axel-download-accelerator/axel.git | tail --lines=1 | cut --delimiter='/' --fields=3 | cut -c 2-)"
+            sed -i 's/^\(version: \).*$/\1'"\"$version\""'/' snap/snapcraft.yaml
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -1,5 +1,6 @@
 name: axel
 adopt-info: axel
+version: '2.17.11'
 summary: Lightweight CLI download accelerator
 title: Axel
 description: |
@@ -34,13 +35,10 @@ architectures:
 parts:
   axel:
     source: https://github.com/axel-download-accelerator/axel.git
-    source-tag: 'v2.17.11'
+    source-tag: 'v${SNAPCRAFT_PROJECT_VERSION}'
     plugin: autotools
     autotools-configure-parameters:
       - --prefix=/usr
-    override-pull: |
-      craftctl default
-      craftctl set version=$(git describe --tags --abbrev=0 | cut -c 2-)
     build-packages:
       - autoconf
       - autoconf-archive