Skip to content

Commit

Permalink
Merge refs/heads/main into jbohanon/missing-tls-secret
Browse files Browse the repository at this point in the history
  • Loading branch information
soloio-bulldozer[bot] authored Aug 20, 2024
2 parents bd91d85 + 67ac4e5 commit 2df643e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,10 @@ generated-code-apis: clean-solo-kit-gen go-generate-apis fmt ## Executes the tar
.PHONY: generated-code-cleanup
generated-code-cleanup: getter-check mod-tidy update-licenses fmt ## Executes the targets necessary to cleanup and format code

.PHONY: generate-changelog
generate-changelog: ## Generate a changelog entry
@./devel/tools/changelog.sh

#----------------------------------------------------------------------------------
# Generate mocks
#----------------------------------------------------------------------------------
Expand Down
6 changes: 6 additions & 0 deletions changelog/v1.18.0-beta16/add-generate-changelog-target.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
changelog:
- type: NON_USER_FACING
description: |
Add a `generate-changelog` target to the Makefile that will
generate a changelog for the current release.
resolvesIssue: false
3 changes: 2 additions & 1 deletion devel/tools/changelog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ EOF
echo "Wrote to $CHANGELOG_FILE"
fi

# TODO this is a quick hack to avoid args parsing. If this script grows in complexity, parsing args will be more appropriate than this check.
# TODO this is a quick hack to avoid args parsing. If this script grows in complexity,
# parsing args will be more appropriate than this check.
if [[ $# > 0 ]] && [[ "$1" == "edit" ]]; then
echo "Editing..."
"$EDITOR" "$CHANGELOG_FILE"
Expand Down

0 comments on commit 2df643e

Please sign in to comment.