kjg/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleanup the release process

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2013-09-04 22:58:52 +02:00
parent 74449ba45e
commit c68c11dce1
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -99,7 +99,7 @@ man-dist: man check-date
cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${MANWEBDIR}/man7 cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${MANWEBDIR}/man7
cd ${MANWEBDIR} && git add . && git commit -m "cdist manpages update: $(CHANGELOG_VERSION)" || true cd ${MANWEBDIR} && git add . && git commit -m "cdist manpages update: $(CHANGELOG_VERSION)" || true
man-release: web-release man-fix-link: web-pub
# Fix ikiwiki, which does not like symlinks for pseudo security # Fix ikiwiki, which does not like symlinks for pseudo security
ssh tee.schottelius.org \ ssh tee.schottelius.org \
"cd /home/services/www/nico/www.nico.schottelius.org/www/software/cdist/man && rm -f latest && ln -sf "$(CHANGELOG_VERSION)" latest" "cd /home/services/www/nico/www.nico.schottelius.org/www/software/cdist/man && rm -f latest && ln -sf "$(CHANGELOG_VERSION)" latest"
@ -143,9 +143,11 @@ web-doc:
web-dist: web-blog web-doc web-dist: web-blog web-doc
web-release: web-dist man-dist speeches-dist web-pub: web-dist man-dist speeches-dist
cd "${WEBDIR}" && make pub cd "${WEBDIR}" && make pub
web-release-all: man-fix-link
################################################################################ ################################################################################
# Release: Mailinglist # Release: Mailinglist
# #
@ -175,7 +177,7 @@ freecode-release: $(FREECODE_FILE)
# #
PYPI_FILE=.lock-pypi PYPI_FILE=.lock-pypi
pypi-release: $(PYPI_FILE) git-branch-merge pypi-release: $(PYPI_FILE)
$(PYPI_FILE): man $(VERSION_FILE) $(PYPI_FILE): man $(VERSION_FILE)
python3 setup.py sdist upload python3 setup.py sdist upload
@ -187,7 +189,7 @@ $(PYPI_FILE): man $(VERSION_FILE)
ARCHLINUX_FILE=.lock-archlinux ARCHLINUX_FILE=.lock-archlinux
ARCHLINUXTAR=cdist-$(CHANGELOG_VERSION)-1.src.tar.gz ARCHLINUXTAR=cdist-$(CHANGELOG_VERSION)-1.src.tar.gz
$(ARCHLINUXTAR): PKGBUILD pypi-release $(ARCHLINUXTAR): PKGBUILD
makepkg -c --source makepkg -c --source
PKGBUILD: PKGBUILD.in $(VERSION_FILE) PKGBUILD: PKGBUILD.in $(VERSION_FILE)

19
bin/build-helper
View file

@ -239,16 +239,23 @@ eof
git checkout master git checkout master
git merge "$target_branch" git merge "$target_branch"
# Publish git changes
make pub
exit 0 # publish man, speeches, website
make web-release-all
make speeches-dist # Create and publish package for pypi
make pypi-release
RELEASE=speeches-dist web-release # Archlinux release is based on pypi
RELEASE+=ml-release freecode-release make archlinux-release
RELEASE+=man-dist pypi-release git-release
RELEASE+=archlinux-release
# Announce change on Freecode
make freecode-release
# Announce change on ML
make ml-release
;; ;;
test) test)