From 4bf08e6b6d68b87b2431774c7d663b422b979cc2 Mon Sep 17 00:00:00 2001 From: Alex Goodman Date: Thu, 21 Oct 2021 13:37:13 -0400 Subject: [PATCH] swap out the changelog generator for chronicle tool (#580) Signed-off-by: Alex Goodman --- .github/workflows/release.yaml | 4 ---- Makefile | 22 +++------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ace7b727e..08dc3e24b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -96,10 +96,6 @@ jobs: steps: - uses: docker-practice/actions-setup-docker@v1 - # note, it is important to always be auth'd into docker.io to prevent rate limiting issues - - name: Login to Docker Hub - run: echo ${{ secrets.TOOLBOX_DOCKER_PASS }} | docker login docker.io -u ${{ secrets.TOOLBOX_DOCKER_USER }} --password-stdin - - uses: actions/setup-go@v2 with: go-version: ${{ env.GO_VERSION }} diff --git a/Makefile b/Makefile index cdba6d59a..92d47b137 100644 --- a/Makefile +++ b/Makefile @@ -103,6 +103,7 @@ bootstrap-tools: $(TEMPDIR) GO111MODULE=off GOBIN=$(shell realpath $(TEMPDIR)) go get -u golang.org/x/perf/cmd/benchstat curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TEMPDIR)/ v1.42.1 curl -sSfL https://raw.githubusercontent.com/wagoodman/go-bouncer/master/bouncer.sh | sh -s -- -b $(TEMPDIR)/ v0.2.0 + curl -sSfL https://raw.githubusercontent.com/anchore/chronicle/main/install.sh | sh -s -- -b $(TEMPDIR)/ v0.1.2-beta .github/scripts/goreleaser-install.sh -b $(TEMPDIR)/ v0.177.0 .PHONY: bootstrap-go @@ -251,31 +252,14 @@ cli: $(SNAPSHOTDIR) ## Run CLI tests .PHONY: changlog-release changelog-release: - @echo "Last tag: $(SECOND_TO_LAST_TAG)" - @docker run --rm \ - -v "$(shell pwd)":/usr/local/src/your-app \ - ferrarimarco/github-changelog-generator \ - --user anchore \ - --project $(BIN) \ - -t ${GITHUB_TOKEN} \ - --exclude-labels 'duplicate,question,invalid,wontfix,size:small,size:medium,size:large,size:x-large' \ - --no-pr-wo-labels \ - --no-issues-wo-labels \ - --since-tag $(SECOND_TO_LAST_TAG) + $(TEMPDIR)/chronicle --since-tag $(SECOND_TO_LAST_TAG) --until-tag $(LAST_TAG) -vv > CHANGELOG.md @printf '\n$(BOLD)$(CYAN)Release $(VERSION) Changelog$(RESET)\n\n' @cat CHANGELOG.md .PHONY: changelog-unreleased changelog-unreleased: ## show the current changelog that will be produced on the next release (note: requires GITHUB_TOKEN set) - @docker run -it --rm \ - -v "$(shell pwd)":/usr/local/src/your-app \ - ferrarimarco/github-changelog-generator \ - --user anchore \ - --project $(BIN) \ - -t ${GITHUB_TOKEN} \ - --exclude-labels 'duplicate,question,invalid,wontfix,size:small,size:medium,size:large,size:x-large' \ - --since-tag $(LAST_TAG) + $(TEMPDIR)/chronicle --since-tag $(LAST_TAG) -vv > CHANGELOG.md @printf '\n$(BOLD)$(CYAN)Unreleased Changes (closed PRs and issues will not be in the final changelog)$(RESET)\n'