remove unreleased tags and exclude size labels

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
This commit is contained in:
Alex Goodman 2020-09-25 18:28:48 -04:00
parent 9bd9dad76c
commit 8b81c87d18
No known key found for this signature in database
GPG key ID: 5CB45AE22BAB7EA7
2 changed files with 16 additions and 12 deletions

View file

@ -123,14 +123,14 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.TOOLBOX_AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY_ID: ${{ secrets.TOOLBOX_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLBOX_AWS_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLBOX_AWS_SECRET_ACCESS_KEY }}
- uses: 8398a7/action-slack@v3 # - uses: 8398a7/action-slack@v3
with: # with:
status: ${{ job.status }} # status: ${{ job.status }}
fields: repo,workflow,action,eventName # fields: repo,workflow,action,eventName
text: "A new Syft release is ready to be (manually) published from https://github.com/anchore/syft/releases" # text: "A new Syft release is ready to be (manually) published from https://github.com/anchore/syft/releases"
env: # env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_TOOLBOX_WEBHOOK_URL }} # SLACK_WEBHOOK_URL: ${{ secrets.SLACK_TOOLBOX_WEBHOOK_URL }}
if: ${{ success() }} # if: ${{ success() }}
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:

View file

@ -28,6 +28,7 @@ ifeq "$(strip $(VERSION))" ""
endif endif
# used to generate the changelog from the second to last tag to the current tag (used in the release pipeline when the release tag is in place) # used to generate the changelog from the second to last tag to the current tag (used in the release pipeline when the release tag is in place)
LAST_TAG := $(shell git describe --abbrev=0 --tags $(shell git rev-list --tags --max-count=1))
SECOND_TO_LAST_TAG := $(shell git describe --abbrev=0 --tags $(shell git rev-list --tags --skip=1 --max-count=1)) SECOND_TO_LAST_TAG := $(shell git describe --abbrev=0 --tags $(shell git rev-list --tags --skip=1 --max-count=1))
## Variable assertions ## Variable assertions
@ -238,10 +239,10 @@ changelog-release:
--user anchore \ --user anchore \
--project $(BIN) \ --project $(BIN) \
-t ${GITHUB_TOKEN} \ -t ${GITHUB_TOKEN} \
--exclude-labels 'duplicate,question,invalid,wontfix,size:small,size:medium,size:large,size:x-large' \
--no-pr-wo-labels \ --no-pr-wo-labels \
--no-issues-wo-labels \ --no-issues-wo-labels \
--since-tag $(SECOND_TO_LAST_TAG) \ --since-tag $(SECOND_TO_LAST_TAG)
--due-tag $(VERSION)
.PHONY: changelog-unreleased .PHONY: changelog-unreleased
changelog-unreleased: ## show the current changelog that will be produced on the next release (note: requires GITHUB_TOKEN set) changelog-unreleased: ## show the current changelog that will be produced on the next release (note: requires GITHUB_TOKEN set)
@ -250,12 +251,15 @@ changelog-unreleased: ## show the current changelog that will be produced on the
--user anchore \ --user anchore \
--project $(BIN) \ --project $(BIN) \
-t ${GITHUB_TOKEN} \ -t ${GITHUB_TOKEN} \
--unreleased-only --exclude-labels 'duplicate,question,invalid,wontfix,size:small,size:medium,size:large,size:x-large' \
--since-tag $(LAST_TAG)
@printf '\n$(BOLD)$(CYAN)Unreleased Changes (closed PRs and issues will not be in the final changelog)$(RESET)\n' @printf '\n$(BOLD)$(CYAN)Unreleased Changes (closed PRs and issues will not be in the final changelog)$(RESET)\n'
@docker run -it --rm \ @docker run -it --rm \
-v $(shell pwd)/CHANGELOG.md:/CHANGELOG.md \ -v $(shell pwd)/CHANGELOG.md:/CHANGELOG.md \
rawkode/mdv \ rawkode/mdv \
-t 785.3229 \ -t 696.6153 \
/CHANGELOG.md /CHANGELOG.md
.PHONY: release .PHONY: release