mirror of https://github.com/containers/podman.git
Remove changelog.txt from the repository
The changelog.txt file hasn't been kept in sync with release tags, especially on main, so remove it. The release notes will be featured in RELEASE_NOTES.md. Signed-off-by: jesperpedersen <jesper.pedersen@redhat.com> [NO TESTS NEEDED]
This commit is contained in:
parent
c20227bd16
commit
0d1ba0a58f
13
Makefile
13
Makefile
|
@ -258,7 +258,7 @@ test/goecho/goecho: .gopathok $(wildcard test/goecho/*.go)
|
|||
|
||||
.PHONY: codespell
|
||||
codespell:
|
||||
codespell -S bin,vendor,.git,go.sum,changelog.txt,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L uint,iff,od,seeked,splitted,marge,ERRO,hist,ether -w
|
||||
codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L uint,iff,od,seeked,splitted,marge,ERRO,hist,ether -w
|
||||
|
||||
.PHONY: validate
|
||||
validate: gofmt lint .gitvalidation validate.completions man-page-check swagger-check tests-included tests-expect-exit
|
||||
|
@ -469,17 +469,6 @@ swagger: pkg/api/swagger.yaml
|
|||
docker-docs: docs
|
||||
(cd docs; ./dckrman.sh ./build/man/*.1)
|
||||
|
||||
.PHONY: changelog
|
||||
changelog: ## Generate updated changelog.txt from git logs
|
||||
@echo "Creating changelog from $(CHANGELOG_BASE) to $(CHANGELOG_TARGET)"
|
||||
$(eval TMPFILE := $(shell mktemp podman_tmp_XXXX))
|
||||
$(shell cat changelog.txt > $(TMPFILE))
|
||||
$(shell echo "- Changelog for $(CHANGELOG_TARGET) ($(ISODATE)):" > changelog.txt)
|
||||
$(shell git log --no-merges --format=" * %s" $(CHANGELOG_BASE)..$(CHANGELOG_TARGET) >> changelog.txt)
|
||||
$(shell echo "" >> changelog.txt)
|
||||
$(shell cat $(TMPFILE) >> changelog.txt)
|
||||
$(shell rm $(TMPFILE))
|
||||
|
||||
# Workaround vim syntax highlighting bug: "
|
||||
|
||||
###
|
||||
|
|
|
@ -164,10 +164,6 @@ spelled with complete minutiae.
|
|||
`git checkout -b bump_vX.Y.Z`.
|
||||
1. Lookup the *COMMIT ID* of the last release,
|
||||
`git log -1 $(git tag | sort -V | tail -1)`.
|
||||
1. Run `make changelog CHANGELOG_BASE=`*COMMIT ID*. This will modify the
|
||||
`changelog.txt` file. Manually edit it to change the first line
|
||||
(“Changelog for …”) to include the current (new) release version number.
|
||||
For example, `- Changelog for v2.1.0 (2020-09-22):`.
|
||||
1. Edit `version/version.go` and bump the `Version` value to the new
|
||||
release version. If there were API changes, also bump `APIVersion` value.
|
||||
1. Commit this and sign the commit (`git commit -a -s -S`). The commit message
|
||||
|
|
6837
changelog.txt
6837
changelog.txt
File diff suppressed because it is too large
Load Diff
|
@ -35,7 +35,6 @@ filtered_changes=$(git diff --name-status $base $head |
|
|||
fgrep -vx .cirrus.yml |
|
||||
fgrep -vx .gitignore |
|
||||
fgrep -vx Makefile |
|
||||
fgrep -vx changelog.txt |
|
||||
fgrep -vx go.mod |
|
||||
fgrep -vx go.sum |
|
||||
egrep -v '^[^/]+\.md$' |
|
||||
|
|
|
@ -36,20 +36,10 @@ write_spec_version()
|
|||
sed -i "s/^\(Version: *\).*/\1${LOCAL_VERSION}/" contrib/spec/podman.spec.in
|
||||
}
|
||||
|
||||
write_changelog()
|
||||
{
|
||||
echo "- Changelog for v${VERSION} (${DATE})" >.changelog.txt &&
|
||||
git log --no-merges --format=' * %s' "${LAST_TAG}..HEAD" >>.changelog.txt &&
|
||||
echo >>.changelog.txt &&
|
||||
cat changelog.txt >>.changelog.txt &&
|
||||
mv -f .changelog.txt changelog.txt
|
||||
}
|
||||
|
||||
release_commit()
|
||||
{
|
||||
write_go_version "${VERSION}" &&
|
||||
write_spec_version "${VERSION}" &&
|
||||
write_changelog &&
|
||||
git commit -asm "Bump to v${VERSION}"
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue