add support for pkgrel updates

4 files changed, 18 insertions, 6 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4fe21ea165c4..80d1fbbde7e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,7 +61,8 @@ push_package:
     - |
         if ! git diff --cached --exit-code; then
           pkgver="$(grep -E '^pkgver=' PKGBUILD | cut -d'=' -f2)"
-          git commit -m "Update to ${pkgver}."
+          pkgrel="$(grep -E '^pkgrel=' PKGBUILD | cut -d'=' -f2)"
+          git commit -m "Update to ${pkgver}-${pkgrel}."
         fi
     - git push origin HEAD:main
     - git remote add aur ssh://aur@aur.archlinux.org/fleet-orbit.git
diff --git a/PKGBUILD.jinja b/PKGBUILD.jinja
index b5544ee93e85..fc6aa8e9e1d6 100644
--- a/PKGBUILD.jinja
+++ b/PKGBUILD.jinja
@@ -2,7 +2,7 @@
 
 pkgname=fleet-orbit
 pkgver={{ metadata.tag_info.pkgver }}
-pkgrel=1
+pkgrel={{ metadata.pkgrel }}
 pkgdesc='Eases the deployment of osquery connected with a Fleet server.'
 arch=(x86_64)
 url='https://github.com/fleetdm/fleet/tree/main/orbit'
diff --git a/metadata.json b/metadata.json
index ac7a1b547af3..ae04241d6392 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,4 +1,5 @@
 {
+  "pkgrel": 1,
   "release_sha512sum": "84116aad0739384081997401c91a4d4bbe96ec6e25d6ec9b04a0abdf875d2e8bf9ec990b607d84c5741dd0dcfd26942ccac72df17a1de469b402c8e81608435c",
   "tag_info": {
     "commit_sha": "716e06a7d388289f36a6b06b648a1594d9df1689",
@@ -6,4 +7,4 @@
     "pkgver": "0.0.11",
     "tarball_url": "https://github.com/fleetdm/fleet/archive/refs/tags/orbit-v0.0.11.tar.gz"
   }
-}
\ No newline at end of file
+}
diff --git a/render_pkgbuild.py b/render_pkgbuild.py
index cd10e8f3093b..97c5cb7660a0 100755
--- a/render_pkgbuild.py
+++ b/render_pkgbuild.py
@@ -28,6 +28,7 @@ class TagInfo(typing.TypedDict):
 class Metadata(typing.TypedDict):
     tag_info: TagInfo
     release_sha512sum: str
+    pkgrel: int
 
 
 def query_latest_tag_info() -> TagInfo:
@@ -46,15 +47,24 @@ def query_latest_tag_info() -> TagInfo:
 
 def refresh_metadata(tag_info: TagInfo) -> Metadata:
     release_sha512sum: typing.Optional[str] = None
+    pkgrel = 1
     if METADATA_PATH.exists():
         old_metadata: Metadata = json.loads(METADATA_PATH.read_text())
-        if tag_info == old_metadata["tag_info"]:
+        if tag_info["name"] == old_metadata["tag_info"]["name"]:
+            # Existing release, no need to re-compute checksum.
             release_sha512sum = old_metadata["release_sha512sum"]
+            # Get pkgrel from existing metadata.
+            pkgrel = old_metadata["pkgrel"]
+        else:
+            # New release, reset pkgrel.
+            pkgrel = 1
 
     metadata: Metadata = {
         "tag_info": tag_info,
-        "release_sha512sum": release_sha512sum
-        or compute_remote_checksum(tag_info["tarball_url"]),
+        "release_sha512sum": (
+            release_sha512sum or compute_remote_checksum(tag_info["tarball_url"])
+        ),
+        "pkgrel": pkgrel,
     }
 
     METADATA_PATH.write_text(json.dumps(metadata, sort_keys=True, indent=2))