From 6cb54e2df952572b99f8d32eedef4792c07e1871 Mon Sep 17 00:00:00 2001
From: mutantmonkey <hello@mutantmonkey.mx>
Date: Wed, 6 Nov 2024 02:37:35 -0800
Subject: [PATCH] upgpkg: flyctl 0.3.33-2

Build from Git instead of release archive. This ensures that we can pull
in metadata about the commit that was used for the build. Additionally,
this allows for matching the source files against whatsrc.org by pulling
in data from Homebrew.
---
 flyctl/.SRCINFO | 6 +++---
 flyctl/PKGBUILD | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/flyctl/.SRCINFO b/flyctl/.SRCINFO
index 16b40b11..7706bfc7 100644
--- a/flyctl/.SRCINFO
+++ b/flyctl/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = flyctl
 	pkgdesc = Command line tools for fly.io services
 	pkgver = 0.3.33
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/superfly/flyctl
 	arch = x86_64
 	license = Apache-2.0
 	makedepends = go
-	source = https://github.com/superfly/flyctl/archive/v0.3.33/flyctl-0.3.33.tar.gz
-	b2sums = a2fa3aa39b62efe4cb09c964c491ee72f19933b11c432e4a682d0ca6298b800e2d948c8c4daca1cfa62d794c55e75153d412b79868ecf6ebf2f7a0e7fef2c504
+	source = flyctl-0.3.33::git+https://github.com/superfly/flyctl.git#tag=v0.3.33
+	b2sums = 83e0e53b651ba63d0100ef570021002ca3ebfe4b72bdb98344ca08fb5930370251a4df0a85633dff46cbcab0bda4c3c60e852f87cdf359a49b268b383a785c5d
 
 pkgname = flyctl
diff --git a/flyctl/PKGBUILD b/flyctl/PKGBUILD
index acfb7b8f..b051d335 100644
--- a/flyctl/PKGBUILD
+++ b/flyctl/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgname=flyctl
 pkgver=0.3.33
-pkgrel=1
+pkgrel=2
 pkgdesc="Command line tools for fly.io services"
 arch=("x86_64")
 url="https://github.com/superfly/flyctl"
 license=("Apache-2.0")
 makedepends=(go)
-source=("$url/archive/v$pkgver/$pkgname-$pkgver.tar.gz")
-b2sums=('a2fa3aa39b62efe4cb09c964c491ee72f19933b11c432e4a682d0ca6298b800e2d948c8c4daca1cfa62d794c55e75153d412b79868ecf6ebf2f7a0e7fef2c504')
+source=("${pkgname}-${pkgver}::git+https://github.com/superfly/flyctl.git#tag=v${pkgver}")
+b2sums=('83e0e53b651ba63d0100ef570021002ca3ebfe4b72bdb98344ca08fb5930370251a4df0a85633dff46cbcab0bda4c3c60e852f87cdf359a49b268b383a785c5d')
 
 build() {
   now_iso8601=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
@@ -24,7 +24,7 @@ build() {
   export CGO_ENABLED=0
   go build \
     -o bin/flyctl \
-    -ldflags="-s -w -X 'github.com/superfly/flyctl/internal/buildinfo.buildDate=${now_iso8601}' -X 'github.com/superfly/flyctl/internal/buildinfo.buildVersion=${pkgver}'" \
+    -ldflags="-s -w -X 'github.com/superfly/flyctl/internal/buildinfo.buildDate=${now_iso8601}' -X 'github.com/superfly/flyctl/internal/buildinfo.buildVersion=${pkgver}' -X github.com/superfly/flyctl/internal/buildinfo.commit=$(git rev-parse --short --verify --quiet HEAD)" \
     -tags production \
     .
 }
-- 
2.51.2