diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f16e900c..e8700f1fe 100644 --- 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 diff --git a/hugoreleaser.env b/hugoreleaser.env index 5d0dc80d3..a17dd556e 100644 --- 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 diff --git a/hugoreleaser.toml b/hugoreleaser.toml index e9bf8b6f1..beffa0e71 100644 --- 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" diff --git a/releaser/releaser.go b/releaser/releaser.go index fc16a2572..afb5079a1 100644 --- 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 {