Change 'release-*' to 'v*.*.*' pattern for release branches, for compatibility with Go build tools

This commit is contained in:
Alessio 2024-06-10 18:18:36 -07:00
parent f4181d0c4c
commit 033fe3409f
2 changed files with 10 additions and 10 deletions

View File

@ -23,7 +23,7 @@ pipeline:
- path: - path:
- pkg/scraper/** - pkg/scraper/**
- cmd/** - cmd/**
- branch: release-* - branch: v*.*.*
commands: commands:
- cd cmd - cd cmd
- ./tests.sh - ./tests.sh
@ -41,11 +41,11 @@ pipeline:
version_bump_test: version_bump_test:
image: offline-twitter/go image: offline-twitter/go
when: when:
branch: release-* branch: v*.*.*
secrets: secrets:
- offline_twatter_passwd - offline_twatter_passwd
commands: 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 - - 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 - echo "deb https://apt.playfulpachyderm.com/ ./" | sudo tee /etc/apt/sources.list.d/offline_twitter.list
- sudo apt update - sudo apt update
@ -62,10 +62,10 @@ pipeline:
dpkg_build_and_upload: dpkg_build_and_upload:
when: when:
branch: release-* branch: v*.*.*
image: offline-twitter/deploy image: offline-twitter/deploy
commands: 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 - cd build
- ./build_dpkg.sh $version - ./build_dpkg.sh $version
- scp offline-twitter_$${version}_all.deb aptrepo@apt.playfulpachyderm.com:/apt-repo/test-repo - scp offline-twitter_$${version}_all.deb aptrepo@apt.playfulpachyderm.com:/apt-repo/test-repo
@ -74,20 +74,20 @@ pipeline:
windows_build: windows_build:
image: offline-twitter/go-mingw image: offline-twitter/go-mingw
when: when:
branch: release-* branch: v*.*.*
commands: commands:
- cd cmd - 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-compile.sh $version
windows_package_and_upload: windows_package_and_upload:
when: when:
branch: release-* branch: v*.*.*
image: offline-twitter/innosetup image: offline-twitter/innosetup
secrets: secrets:
- offline_twatter_id_ecdsa - offline_twatter_id_ecdsa
commands: 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 - iscc.sh /Dversion=$version /Dexe_path=`winepath -w cmd/twitter.exe` build/windows/setup.iss
- eval $(ssh-agent) - eval $(ssh-agent)
- echo "$OFFLINE_TWATTER_ID_ECDSA" | ssh-add - - echo "$OFFLINE_TWATTER_ID_ECDSA" | ssh-add -

View File

@ -4,4 +4,4 @@
- if `persistence/schema.sql` has changed since last release: - if `persistence/schema.sql` has changed since last release:
- add an entry to MIGRATIONS in `persistence/versions.go` - add an entry to MIGRATIONS in `persistence/versions.go`
- update `sample_data/seed_data.sql`, including database_version - 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