From a75f401a747983aef9bf33e48f5a5a7a27f21352 Mon Sep 17 00:00:00 2001
From: Ben Hoyt <ben.hoyt@canonical.com>
Date: Fri, 24 Mar 2023 16:35:54 +1300
Subject: [PATCH] Simpler way to get PEBBLE_VERSION

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3fa8a7af..4cf99b03 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -39,10 +39,10 @@ jobs:
 
         cp COPYING dist/build
         cp README.md dist/build
-        PEBBLE_VERSION=$(go run ./cmd/pebble version | awk '/client/ { print $2 }')
+        PEBBLE_VERSION=$(git describe --tags --always | awk '{ print substr($0, 2) }')  # trim "v" prefix
         ARCHIVE_FILE=pebble_${PEBBLE_VERSION}_${GOOS}_${GOARCH}.tar.gz
         echo Creating archive $ARCHIVE_FILE
         tar -czf dist/$ARCHIVE_FILE -C dist/build .
 
-        echo Uploading $ARCHIVE_FILE to relase v$PEBBLE_VERSION
+        echo Uploading $ARCHIVE_FILE to release v$PEBBLE_VERSION
         gh release upload v$PEBBLE_VERSION dist/$ARCHIVE_FILE