From 033fe3409f745edad1681065a470e0e7614f83c8 Mon Sep 17 00:00:00 2001
From: Alessio <alex@playfulpachyderm.com>
Date: Mon, 10 Jun 2024 18:18:36 -0700
Subject: [PATCH] Change 'release-*' to 'v*.*.*' pattern for release branches,
 for compatibility with Go build tools

---
 .woodpecker/build.yml  | 18 +++++++++---------
 doc/release_process.md |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index 72a5289..00af38f 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -23,7 +23,7 @@ pipeline:
       - path:
         - pkg/scraper/**
         - cmd/**
-      - branch: release-*
+      - branch: v*.*.*
     commands:
       - cd cmd
       - ./tests.sh
@@ -41,11 +41,11 @@ pipeline:
   version_bump_test:
     image: offline-twitter/go
     when:
-      branch: release-*
+      branch: v*.*.*
     secrets:
       - offline_twatter_passwd
     commands:
-      - export version=$(echo $CI_COMMIT_BRANCH | grep -Poh "(?<=^release-)\d+\.\d+\.\d+")
+      - export version=$(echo $CI_COMMIT_BRANCH | grep -Poh "(?<=^v)\d+\.\d+\.\d+")
       - curl https://apt.playfulpachyderm.com/KEY.gpg | sudo apt-key add -
       - echo "deb https://apt.playfulpachyderm.com/ ./" | sudo tee /etc/apt/sources.list.d/offline_twitter.list
       - sudo apt update
@@ -62,10 +62,10 @@ pipeline:
 
   dpkg_build_and_upload:
     when:
-      branch: release-*
+      branch: v*.*.*
     image: offline-twitter/deploy
     commands:
-      - export version=$(echo $CI_COMMIT_BRANCH | grep -Poh "(?<=^release-)\d+\.\d+\.\d+")
+      - export version=$(echo $CI_COMMIT_BRANCH | grep -Poh "(?<=^v)\d+\.\d+\.\d+")
       - cd build
       - ./build_dpkg.sh $version
       - scp offline-twitter_$${version}_all.deb aptrepo@apt.playfulpachyderm.com:/apt-repo/test-repo
@@ -74,20 +74,20 @@ pipeline:
   windows_build:
     image: offline-twitter/go-mingw
     when:
-      branch: release-*
+      branch: v*.*.*
     commands:
       - cd cmd
-      - export version=$(echo $CI_COMMIT_BRANCH | grep -Poh "(?<=^release-)\d+\.\d+\.\d+")
+      - export version=$(echo $CI_COMMIT_BRANCH | grep -Poh "(?<=^v)\d+\.\d+\.\d+")
       - ./windows-compile.sh $version
 
   windows_package_and_upload:
     when:
-      branch: release-*
+      branch: v*.*.*
     image: offline-twitter/innosetup
     secrets:
       - offline_twatter_id_ecdsa
     commands:
-      - export version=$(echo $CI_COMMIT_BRANCH | grep -Poh "(?<=^release-)\d+\.\d+\.\d+")
+      - export version=$(echo $CI_COMMIT_BRANCH | grep -Poh "(?<=^v)\d+\.\d+\.\d+")
       - iscc.sh /Dversion=$version /Dexe_path=`winepath -w cmd/twitter.exe` build/windows/setup.iss
       - eval $(ssh-agent)
       - echo "$OFFLINE_TWATTER_ID_ECDSA" | ssh-add -
diff --git a/doc/release_process.md b/doc/release_process.md
index 8317770..d663dc3 100644
--- a/doc/release_process.md
+++ b/doc/release_process.md
@@ -4,4 +4,4 @@
 - if `persistence/schema.sql` has changed since last release:
 	- add an entry to MIGRATIONS in `persistence/versions.go`
 	- update `sample_data/seed_data.sql`, including database_version
-- checkout a branch `release-x.y.z` with the version number x.y.z and push it
+- checkout a branch `vX.Y.Z` with the version number X.Y.Z and push it