release: Fix the Deb archives - hugo - [fork] hugo port for 9front
(HTM) git clone git@git.drkhsh.at/hugo.git
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) Submodules
(DIR) README
(DIR) LICENSE
---
(DIR) commit 79932e72257efe2ea525d546b32b3ecd3988605b
(DIR) parent 9eb9b70a29ce84abc754e634e69511c4044e5570
(HTM) Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Mon, 29 Aug 2022 11:47:37 +0200
release: Fix the Deb archives
Fixes #10220
Diffstat:
M .circleci/config.yml | 4 ++--
M hugoreleaser.env | 2 --
M hugoreleaser.toml | 6 +++++-
M releaser/releaser.go | 7 +++++--
4 files changed, 12 insertions(+), 7 deletions(-)
---
(DIR) diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,7 +4,7 @@ parameters:
defaults: &defaults
resource_class: large
docker:
- - image: bepsays/ci-hugoreleaser:1.21900.20000
+ - image: bepsays/ci-hugoreleaser:1.21900.20001
environment: &buildenv
GOMODCACHE: /root/project/gomodcache
version: 2
@@ -60,7 +60,7 @@ jobs:
environment:
<<: [*buildenv]
docker:
- - image: bepsays/ci-hugoreleaser-linux-arm64:1.21900.20000
+ - image: bepsays/ci-hugoreleaser-linux-arm64:1.21900.20001
steps:
- *restore-cache
- &attach-workspace
(DIR) diff --git a/hugoreleaser.env b/hugoreleaser.env
@@ -1,5 +1,3 @@
-HUGO_RELEASE_NAME=New release setup
-
# Release env.
# These will be replaced by script before release.
HUGORELEASER_TAG=v0.102.0
(DIR) diff --git a/hugoreleaser.toml b/hugoreleaser.toml
@@ -33,7 +33,7 @@ project = "hugo"
dragonfly = "DragonFlyBSD"
[release_settings]
- name = "${HUGO_RELEASE_NAME}"
+ name = "${HUGORELEASER_TAG}"
type = "github"
repository = "hugo"
repository_owner = "gohugoio"
@@ -190,6 +190,8 @@ project = "hugo"
[[archives]]
paths = ["builds/**/regular/linux/{arm64,amd64}"]
[archives.archive_settings]
+ binary_dir = "/usr/local/bin"
+ extra_files = []
[archives.archive_settings.type]
format = "_plugin"
extension = ".deb"
@@ -206,6 +208,8 @@ project = "hugo"
[[archives]]
paths = ["builds/**/extended/linux/{arm64,amd64}"]
[archives.archive_settings]
+ binary_dir = "/usr/local/bin"
+ extra_files = []
name_template = "{{ .Project }}_extended_{{ .Tag | trimPrefix `v` }}_{{ .Goos }}-{{ .Goarch }}"
[archives.archive_settings.type]
format = "_plugin"
(DIR) diff --git a/releaser/releaser.go b/releaser/releaser.go
@@ -40,14 +40,17 @@ func New(skipPush, try bool, step int) (*ReleaseHandler, error) {
if err != nil {
return nil, err
}
+ branch = strings.TrimSpace(branch)
+
if !strings.HasPrefix(branch, prefix) {
return nil, fmt.Errorf("branch %q is not a release branch", branch)
}
- logf("Branch: %s\n", branch)
-
version := strings.TrimPrefix(branch, prefix)
version = strings.TrimPrefix(version, "v")
+
+ logf("Branch: %s|Version: v%s\n", branch, version)
+
rh := &ReleaseHandler{branchVersion: version, skipPush: skipPush, try: try, step: step}
if try {