From 3f0b40f6745be98fa193896f4c65afb48b36e96e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Thu, 15 Sep 2022 11:17:51 +0200 Subject: [PATCH 1/3] Use standard GOOS/GOARCH values in release archives But create aliases with old filenames for the 2 most downloaded archives (to avoid Netlify etc. breaking). Fixes #10073 --- .circleci/config.yml | 4 ++-- hugoreleaser.toml | 24 +++++++++++------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2cee047f2..60cfd4278 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.20002 + - image: bepsays/ci-hugoreleaser:1.21900.20003 environment: &buildenv GOMODCACHE: /root/project/gomodcache version: 2 @@ -60,7 +60,7 @@ jobs: environment: <<: [*buildenv] docker: - - image: bepsays/ci-hugoreleaser-linux-arm64:1.21900.20002 + - image: bepsays/ci-hugoreleaser-linux-arm64:1.21900.20003 steps: - *restore-cache - &attach-workspace diff --git a/hugoreleaser.toml b/hugoreleaser.toml index 93266f97e..294c606c9 100644 --- a/hugoreleaser.toml +++ b/hugoreleaser.toml @@ -1,5 +1,15 @@ project = "hugo" +# In Hugo v0.103.0 we removed the archive name replacements (e.g. amd64 => 64bit). +# Using standard GOOS/GOARCH values makes it easier for scripts out there, +# but to prevent breakage in Netlify etc. that has adopted to the old names, +# we create aliases for the most common variants. +# According to download numbers from v0.101.0, these are by a good margin the two most popular: +# hugo_extended_0.101.0_Linux-64bit.tar.gz Downloaded 129,016 times +# hugo_0.101.0_Linux-64bit.tar.gz Downloaded 87,846 times +# This replacement will create 2 extra alias archives. +archive_alias_replacements = { "linux-amd64.tar.gz" = "Linux-64bit.tar.gz" } + [go_settings] go_proxy = "https://proxy.golang.org" go_exe = "go" @@ -19,18 +29,6 @@ project = "hugo" [archive_settings.type] format = "tar.gz" extension = ".tar.gz" - [archive_settings.replacements] - amd64 = "64bit" - 386 = "32bit" - arm = "ARM" - arm64 = "ARM64" - darwin = "macOS" - linux = "Linux" - windows = "Windows" - openbsd = "OpenBSD" - netbsd = "NetBSD" - freebsd = "FreeBSD" - dragonfly = "DragonFlyBSD" [release_settings] name = "${HUGORELEASER_TAG}" @@ -198,7 +196,7 @@ project = "hugo" [archives.archive_settings.plugin] id = "deb" type = "gorun" - command = "github.com/gohugoio/hugoreleaser-archive-plugins/deb@v0.5.0" + command = "github.com/gohugoio/hugoreleaser-archive-plugins/deb@v0.6.1" [archives.archive_settings.custom_settings] vendor = "gohugo.io" homepage = "https://github.com/gohugoio/hugoreleaser" From beebf2afb09a7be36cf12bdec8a99ae9286504e2 Mon Sep 17 00:00:00 2001 From: hugoreleaser Date: Thu, 15 Sep 2022 16:23:56 +0000 Subject: [PATCH 2/3] releaser: Bump versions for release of 0.103.0 [ci skip] --- common/hugo/version_current.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/hugo/version_current.go b/common/hugo/version_current.go index cb40b4159..46db40ec9 100644 --- a/common/hugo/version_current.go +++ b/common/hugo/version_current.go @@ -19,5 +19,5 @@ var CurrentVersion = Version{ Major: 0, Minor: 103, PatchLevel: 0, - Suffix: "-DEV", + Suffix: "", } From 00b71668b22d746e90d1e5af1867d8c14333e764 Mon Sep 17 00:00:00 2001 From: hugoreleaser Date: Thu, 15 Sep 2022 16:35:38 +0000 Subject: [PATCH 3/3] releaser: Prepare repository for 0.104.0-DEV [ci skip] --- common/hugo/version_current.go | 4 ++-- hugoreleaser.env | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/hugo/version_current.go b/common/hugo/version_current.go index 46db40ec9..f93b04b45 100644 --- a/common/hugo/version_current.go +++ b/common/hugo/version_current.go @@ -17,7 +17,7 @@ package hugo // This should be the only one. var CurrentVersion = Version{ Major: 0, - Minor: 103, + Minor: 104, PatchLevel: 0, - Suffix: "", + Suffix: "-DEV", } diff --git a/hugoreleaser.env b/hugoreleaser.env index b3fd4cf74..d9605b5a1 100644 --- a/hugoreleaser.env +++ b/hugoreleaser.env @@ -1,5 +1,6 @@ # Release env. # These will be replaced by script before release. -HUGORELEASER_TAG=v0.102.3 -HUGORELEASER_COMMITISH=b76146b129d7caa52417f8e914fc5b9271bf56fc +HUGORELEASER_TAG=v0.103.0 +HUGORELEASER_COMMITISH=beebf2afb09a7be36cf12bdec8a99ae9286504e2 +