v2-beta1

.github/workflows/build-release.yml

@@ -6,7 +6,7 @@ name: Release Binaries
 on:
   # Workflow executes when a new release is created
   release:
-    types: [created]
+    types: [published]
 
 jobs:
   # most binaries can be built on linux machine which is the most cost-efficient on GitHub actions

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+## [v2.0.0-beta1] - 2023-11-11
+
 ### Bugs
 
  * No longer ignore the `--threads` CLI option
@@ -671,7 +673,8 @@
 
 Initial release
 
-[Unreleased]: https://github.com/synfinatic/aws-sso-cli/compare/v1.14.2...main
+[Unreleased]: https://github.com/synfinatic/aws-sso-cli/compare/v2.0.0-beta1...main
+[v2.0.0-beta1]: https://github.com/synfinatic/aws-sso-cli/releases/tag/v2.0.0-beta1
 [v1.14.2]: https://github.com/synfinatic/aws-sso-cli/releases/tag/v1.14.2
 [v1.14.1]: https://github.com/synfinatic/aws-sso-cli/releases/tag/v1.14.1
 [v1.14.0]: https://github.com/synfinatic/aws-sso-cli/releases/tag/v1.14.0

Makefile

@@ -1,4 +1,4 @@
-PROJECT_VERSION := 2.0.0-beta
+PROJECT_VERSION := 2.0.0-beta1
 DOCKER_REPO     := synfinatic
 PROJECT_NAME    := aws-sso
 
@@ -27,17 +27,14 @@ ifeq ($(PROJECT_DELTA),)
 PROJECT_DELTA             :=
 endif
 
-VERSION_PKG               := $(shell echo $(PROJECT_VERSION) | sed 's/^v//g')
 LICENSE                   := GPLv3
 URL                       := https://github.com/$(DOCKER_REPO)/$(PROJECT_NAME)
 DESCRIPTION               := AWS SSO CLI
+GOBFLAGS                  := -trimpath
 BUILDINFOS                ?= $(shell date +%FT%T%z)$(BUILDINFOSDET)
 LDFLAGS                   := -X "main.Version=$(PROJECT_VERSION)" -X "main.Delta=$(PROJECT_DELTA)" -X "main.Buildinfos=$(BUILDINFOS)" -X "main.Tag=$(PROJECT_TAG)" -X "main.CommitID=$(PROJECT_COMMIT)"
 OUTPUT_NAME               := $(DIST_DIR)$(PROJECT_NAME)-$(PROJECT_VERSION)  # default for current platform
 
-# go build flags
-GOBFLAGS                  := -trimpath
-
 # supported platforms for `make release`
 WINDOWS_BIN               := $(DIST_DIR)$(PROJECT_NAME)-$(PROJECT_VERSION)-windows-amd64.exe
 WINDOWS32_BIN             := $(DIST_DIR)$(PROJECT_NAME)-$(PROJECT_VERSION)-windows-386.exe
@@ -64,14 +61,19 @@ uninstall:  ## Uninstall binary from $INSTALL_PREFIX
 	rm $(INSTALL_PREFIX)/bin/$(PROJECT_NAME)
 
 release-brew: ## Create a PR against homebrew to bump the version
-	VERSION=v$(PROJECT_VERSION) ./scripts/release-check.sh
+	VERSION=$(PROJECT_VERSION) ./scripts/release-check.sh
 	brew update && brew bump-formula-pr --version $(PROJECT_VERSION) aws-sso-cli
 
 release-tag: ## Tag our current HEAD as v$(PROJECT_VERSION)
 	git tag -sa v$(PROJECT_VERSION) -m 'release $(PROJECT_VERSION)'
-	VERSION=v$(PROJECT_VERSION) ./scripts/release-check.sh
+	VERSION=$(PROJECT_VERSION) ./scripts/release-check.sh
 	git push --tags
 
+release-tag-force: ## Force update tag our current HEAD as v$(PROJECT_VERSION)
+	git tag -f -sa v$(PROJECT_VERSION) -m 'release $(PROJECT_VERSION)'
+	VERSION=$(PROJECT_VERSION) ./scripts/release-check.sh
+	git push -f --tags
+
 #DOWNLOAD_URL := https://synfin.net/misc/aws-sso-cli.$(PROJECT_VERSION).tar.gz
 DOWNLOAD_URL ?= https://github.com/synfinatic/aws-sso-cli/archive/refs/tags/v$(PROJECT_VERSION).tar.gz
 
@@ -95,7 +97,7 @@ tags: cmd/aws-sso/*.go sso/*.go internal/*/*.go internal/*/*/*.go ## Create tags
 
 .build-release: windows windows32 linux linux-arm64 darwin darwin-arm64
 
-.validate-release: ALL release-check
+.validate-release: ALL
 	@TAG=$$(./$(DIST_DIR)$(PROJECT_NAME) version 2>/dev/null | grep '(v$(PROJECT_VERSION))'); \
 		if test -z "$$TAG"; then \
 		echo "Build tag from does not match PROJECT_VERSION=v$(PROJECT_VERSION) in Makefile:" ; \

scripts/release-check.sh

@@ -19,7 +19,7 @@ fi
 
 DATE=$(date +%Y-%m-%d)
 if [ -z "$(grep -F "## [${TAG}] - " CHANGELOG.md)" ]; then
-    echo "Error: CHANGELOG.md is missing our [$TAG]"
+    echo "Error: CHANGELOG.md is missing our [$TAG] - $DATE"
     ERROR=1
 elif [ -z "$(grep -F "## [${TAG}] - $DATE" CHANGELOG.md)" ]; then
     echo "Error: CHANGELOG.md has [${TAG}] but wrong date"