From 1b2338cae9a65b3d00ba215ace169cdb03564220 Mon Sep 17 00:00:00 2001 From: Denis Shaporov Date: Thu, 9 Jul 2026 20:31:55 +0300 Subject: [PATCH 1/3] chore: rename taskfile.yaml -> taskfile.yml (go-scaffolds v1.6.0) --- taskfile.yaml => taskfile.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename taskfile.yaml => taskfile.yml (100%) diff --git a/taskfile.yaml b/taskfile.yml similarity index 100% rename from taskfile.yaml rename to taskfile.yml From c148cebcf2b5f43a407dc4e3ad4e528a0800dc0b Mon Sep 17 00:00:00 2001 From: Denis Shaporov Date: Thu, 9 Jul 2026 20:32:00 +0300 Subject: [PATCH 2/3] chore: pull go-scaffolds template updates --- .copier-answers.yml | 2 +- taskfile.yml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 8da67a4..817e915 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY. -_commit: v1.5.0 +_commit: v1.6.0 _src_path: gh:acidsailor/go-scaffolds author: Denis Shaporov / acidsailor author_email: d@shaporov.dev diff --git a/taskfile.yml b/taskfile.yml index 09adde4..5c23521 100644 --- a/taskfile.yml +++ b/taskfile.yml @@ -23,6 +23,15 @@ tasks: cmds: - go test -race ./... +<<<<<<< before updating +======= + check: + desc: Local composite — lint (mutating) + tests + cmds: + - task: lint + - task: test + +>>>>>>> after updating build: desc: Local snapshot build (all platforms) cmds: @@ -33,6 +42,27 @@ tasks: cmds: - goreleaser release --clean +<<<<<<< before updating +======= + release-plan: + desc: Preview the next release version from conventional commits (svu; read-only) + silent: true + cmds: + - svu next --v0 + + release-tag: + desc: Cut & push the next svu tag — fires the GoReleaser `release` job in CI + cmds: + - | + set -euo pipefail + next=$(svu next --v0) + if [ -z "$next" ]; then echo "svu returned no version — is svu installed?" >&2; exit 1; fi + if [ "$next" = "$(svu current)" ]; then echo "nothing to release (at $next)"; exit 0; fi + git tag -a "$next" -m "release $next" + git push origin "$next" + echo "pushed $next → CI will build the release" + +>>>>>>> after updating update: desc: Pull latest go-scaffolds v1 template tooling (3-way merge; source untouched; no prompts) cmds: From 0cc2c3517685a7b560bdbcaf4a4f118c4bd85f96 Mon Sep 17 00:00:00 2001 From: Denis Shaporov Date: Thu, 9 Jul 2026 20:37:27 +0300 Subject: [PATCH 3/3] fix: resolve copier taskfile merge conflicts (keep local drift, add new tasks) --- taskfile.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/taskfile.yml b/taskfile.yml index 5c23521..a2f2bd8 100644 --- a/taskfile.yml +++ b/taskfile.yml @@ -23,15 +23,12 @@ tasks: cmds: - go test -race ./... -<<<<<<< before updating -======= check: desc: Local composite — lint (mutating) + tests cmds: - task: lint - task: test ->>>>>>> after updating build: desc: Local snapshot build (all platforms) cmds: @@ -42,8 +39,6 @@ tasks: cmds: - goreleaser release --clean -<<<<<<< before updating -======= release-plan: desc: Preview the next release version from conventional commits (svu; read-only) silent: true @@ -62,7 +57,6 @@ tasks: git push origin "$next" echo "pushed $next → CI will build the release" ->>>>>>> after updating update: desc: Pull latest go-scaffolds v1 template tooling (3-way merge; source untouched; no prompts) cmds: