Commit f8023e73 authored by Manuel Moos's avatar Manuel Moos

Merge: Release Notes

See merge request !68
parents 971598f9 a374d6e1
Pipeline #173341747 passed with stages
in 19 minutes and 1 second
......@@ -41,7 +41,7 @@ CI_base.tag: gits.tag source.tag result.build_server_32 result.build_client_64 c
touch [email protected]
# minimal expected build to be packable
CI_pack.tag: gits_artifacts.tag source.tag CI_base.tag free.tag upload/PATCHNOTES.md upload/CHANGELOG.md
CI_pack.tag: gits_artifacts.tag source.tag CI_base.tag free.tag upload/PATCHNOTES.md upload/CHANGELOG.md upload/RELEASENOTES.md
touch [email protected]
# all windows builds
......@@ -49,7 +49,7 @@ CI_windows.tag: CI_base.tag closed_regular.tag # steam_windows.tag
touch [email protected]
# all free linux builds (so, no steam)
CI_free.tag: CI_base.tag free.tag
CI_free.tag: CI_base.tag free.tag reformat.tag
touch [email protected]
# (OBSOLETE) targets for CI merge tests, a bit leaner than a full build
......@@ -177,6 +177,9 @@ upload/PATCHNOTES.md: sourcetar.tag upload/.tag
upload/CHANGELOG.md: sourcetar.tag upload/.tag
${top_srcdir}/batch/make/patchnotes.py ${top_srcdir} ${top_srcdir}/CHANGELOG_FROZEN.md armagetronad armagetronad > [email protected]
upload/RELEASENOTES.md: ${src_dir}../deploy/RELEASENOTES.md upload/.tag
cp $< [email protected]
#***************************************************************
# generic context with source
......@@ -502,12 +505,29 @@ steam.tag: steam_windows.tag steam_linux.tag
.PRECIOUS: context.build_client_steam result.build_client_steam context.appdir_client_steam result.build_server_steam context.build_server_steam context.appdir_server_steam context.winbuild_steam context.winsource_steam
#***************************************************************
# Reformat .md files
context.reformat: rootcontext.64 CI_pack.tag ${srcdir}/context/reformat.sh
${srcdir}/prepare_context.sh [email protected].dir $<.dir/'*' upload/*.md ${srcdir}/context/reformat.sh
rm -f [email protected].dir/image
echo "armadeploy_64" > [email protected].dir/image
echo > [email protected]
result.reformat: context.reformat
+$(srcdir)/context_to_result.sh [email protected].dir ./reformat.sh $*
echo > [email protected]
reformat.tag: result.reformat
cp -a $<.dir/*.txt upload/
cp -a $<.dir/*.html upload/
echo > [email protected]
#***************************************************************
# for testing, we want minimal builds before any deployment
# in production, the CI solution is responsible for having built
# everything not explicitly required here
deploy_base.tag: CI_pack.tag debtest.tag ../deploy/targets.sh
deploy_base.tag: CI_pack.tag debtest.tag reformat.tag ../deploy/targets.sh
echo > [email protected]
deploy_base: deploy_base.tag
......
#!/bin/bash
# takes *.md, reformats as .txt and .html
for f in *.md; do
base=`echo $f | sed -e s,\.md\$,,` || exit $?
pandoc -f markdown -t plain < $f > ${base}.txt || exit $?
pandoc -f markdown -t html < $f > ${base}.html || exit $?
done
This is from the 0.2.8.3 branch of development.
It is the most recent LTS (Long Term Support) branch.
While it is the most recent LTS branch,
it will receive security fixes, adaptions to new
compilers and Linux versions and some less important bugfixes.
......@@ -108,12 +108,20 @@ uri_zipsrc: ${SOURCE_ZIP}
EOF
if test -r ../upload/RELEASENOTES.md; then
cat >> ${POST} <<EOF
### Release Notes
EOF
cat ../upload/RELEASENOTES.md >> ${POST}
echo >> ${POST}
fi
if test -r ../upload/PATCHNOTES.md; then
cat >> ${POST} <<EOF
### Patch Notes
EOF
cat ../upload/PATCHNOTES.md >> ${POST}
fi
......
......@@ -23,19 +23,23 @@ set -x
. ./version.sh || exit $?
. ./targets.sh || exit $?
mv upload/RELEASENOTES.txt . || exit $?
mv upload/PATCHNOTES.txt . || exit $?
rm -f upload/*.md upload/*.html
if test ${STAGING} == true; then
echo "Just staging, no upload to Launchpad"
else
EXIT=0
for f in upload/*${PACKAGE_VERSION}* upload/*.md; do
for f in upload/*${PACKAGE_VERSION}* upload/*.txt; do
if test -r $f; then
if ! ./lp-project-upload ${LP_PROJECT} ${LP_SERIES} ${LP_VERSION} $f; then
if ! ./lp-project-upload ${LP_PROJECT} ${LP_SERIES} ${LP_VERSION} $f PATCHNOTES.txt RELEASENOTES.txt; then
sleep 10
if ! ./lp-project-upload ${LP_PROJECT} ${LP_SERIES} ${LP_VERSION} $f; then
if ! ./lp-project-upload ${LP_PROJECT} ${LP_SERIES} ${LP_VERSION} $f PATCHNOTES.txt RELEASENOTES.txt; then
sleep 10
if ! ./lp-project-upload ${LP_PROJECT} ${LP_SERIES} ${LP_VERSION} $f; then
if ! ./lp-project-upload ${LP_PROJECT} ${LP_SERIES} ${LP_VERSION} $f PATCHNOTES.txt RELEASENOTES.txt; then
sleep 10
./lp-project-upload ${LP_PROJECT} ${LP_SERIES} ${LP_VERSION} $f || EXIT=$?
./lp-project-upload ${LP_PROJECT} ${LP_SERIES} ${LP_VERSION} $f PATCHNOTES.txt RELEASENOTES.txt || EXIT=$?
fi
fi
fi
......
......@@ -132,36 +132,32 @@ def main():
if extension == ".tbz":
mime_type="application/bzip2"
if "_client_32_" in fn:
if "_32_" in fn:
description="Client Linux 32 Bit Tarball for Zero Install"
elif "_server_32_" in fn:
description="Server Linux 32 Bit Tarball for Zero Install"
elif "_client_64_" in fn:
elif "_64_" in fn:
description="Client Linux 64 Bit Tarball for Zero Install"
elif "_server_64_" in fn:
description="Server Linux 64 Bit Tarball for Zero Install"
else:
file_type="Code Release Tarball"
description="Source"
else:
if fn == "PATCHNOTES.md":
if fn == "CHANGELOG.txt":
file_type="Release Notes"
description="Patch Notes"
if fn == "CHANGELOG.md":
file_type="ChangeLog File"
description="Changelog"
if extension == ".AppImage":
description="AppImage for Linux"
description="Client AppImage for Linux"
Linux=True
if extension == ".deb":
description="Debian Package"
description="Client Debian Package"
Linux=True
if extension == ".dmg":
description="OSX Disk Image"
description="Client OSX Disk Image"
mime_type="application/x-apple-diskimage"
Mac=True
if extension == ".exe":
description="Windows Installer"
description="Client Windows Installer"
mime_type="application/exe"
Windows=True
if extension == ".zip":
......@@ -178,12 +174,7 @@ def main():
else:
description = description.replace("Linux", "64 bit Linux")
if "edicated" in filename or "server" in filename:
description="Server " + description
else:
if "common" in filename and extension == ".deb":
description="Common " + description
else:
description="Client " + description
description=description.replace("Client ", "Server ")
print (filename,description,mime_type,file_type)
......@@ -243,7 +234,7 @@ def main():
series.newMilestone(name=new_milestone)
except HTTPError, error:
print 'An error happened in the upload:', error.content
print('An error happened in the upload:', error.content, error)
sys.exit(1)
if __name__ == '__main__':
......
......@@ -131,6 +131,7 @@ zip \
FROM armabuild_base as armadeploy_base
RUN apt-get -y update && apt-get install \
0install-core \
pandoc \
-y
FROM armadeploy_base as armadeploy
......
sha256:905b84693436f41a2c64af47515111b5a950725c670bfa0e9f585c15fb48c0c4
sha256:4f3ca8db3b33a868fd6b64f7455529b0ac292ebd9848ce272a62b9e5bd0253bd
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment