opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 12:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11467 from jesperpedersen/changelog

Browse Source 
Remove changelog.txt from the repository
This commit is contained in:
OpenShift Merge Robot
2021-09-07 18:49:23 +02:00
committed by GitHub
parent c9646b5126 0d1ba0a58f
commit fbae579a31
5 changed files with 1 additions and 6864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -258,7 +258,7 @@ test/goecho/goecho: .gopathok $(wildcard test/goecho/*.go)
.PHONY: codespell .PHONY: codespell
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 .PHONY: validate
validate: gofmt lint .gitvalidation validate.completions man-page-check swagger-check tests-included tests-expect-exit 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 docker-docs: docs
(cd docs; ./dckrman.sh ./build/man/*.1) (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: " # Workaround vim syntax highlighting bug: "
### ###

4
RELEASE_PROCESS.md
View File

@ -164,10 +164,6 @@ spelled with complete minutiae.
`git checkout -b bump_vX.Y.Z`. `git checkout -b bump_vX.Y.Z`.
1. Lookup the *COMMIT ID* of the last release, 1. Lookup the *COMMIT ID* of the last release,
`git log -1 $(git tag | sort -V | tail -1)`. `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 1. Edit `version/version.go` and bump the `Version` value to the new
release version. If there were API changes, also bump `APIVersion` value. 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 1. Commit this and sign the commit (`git commit -a -s -S`). The commit message

6837
changelog.txt
View File

File diff suppressed because it is too large Load Diff

1
contrib/cirrus/pr-should-include-tests
View File

@ -35,7 +35,6 @@ filtered_changes=$(git diff --name-status $base $head |
fgrep -vx .cirrus.yml | fgrep -vx .cirrus.yml |
fgrep -vx .gitignore | fgrep -vx .gitignore |
fgrep -vx Makefile | fgrep -vx Makefile |
fgrep -vx changelog.txt |
fgrep -vx go.mod | fgrep -vx go.mod |
fgrep -vx go.sum | fgrep -vx go.sum |
egrep -v '^[^/]+\.md$' | egrep -v '^[^/]+\.md$' |

10
hack/release.sh
View File

@ -36,20 +36,10 @@ write_spec_version()
sed -i "s/^\(Version: *\).*/\1${LOCAL_VERSION}/" contrib/spec/podman.spec.in 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() release_commit()
{ {
write_go_version "${VERSION}" && write_go_version "${VERSION}" &&
write_spec_version "${VERSION}" && write_spec_version "${VERSION}" &&
write_changelog &&
git commit -asm "Bump to v${VERSION}" git commit -asm "Bump to v${VERSION}"
} }