Commit 0c5e602c authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/master' into devel

parents 81c3882c 248174ec
......@@ -90,7 +90,7 @@ If we are at freeze time for a major release:
1. Merge the `master` Git branch into `devel`:
git checkout devel && git merge --no-ff origin/master
git checkout devel && git fetch origin && git merge --no-ff origin/master
2. [[Merge each APT overlay suite|APT_repository/custom#workflow-merge-overlays]]
listed in the `devel` branch's `config/APT_overlays.d/` into the `devel`
......@@ -150,6 +150,8 @@ Bootstrap manual testing coordination:
Update included files
=====================
<a id="upgrade-custom-debs"></a>
Upgrade bundled binary Debian packages
--------------------------------------
......@@ -168,25 +170,20 @@ up-to-date localization files, so:
For each bundled Debian package, `cd` into the package's root
directory (e.g. a checkout of the `whisperback` repository),
and then run the `import-translations` script that is in the
main Tails repository. For example:
import translations from Transifex and sanity-check them:
cd whisperback
"${RELEASE_CHECKOUT:?}"/import-translations
If the `import-translations` script fails to import translations for
the current package, manually copy updated PO files from the
Transifex branches of `git://git.torproject.org/translation.git` (e.g.
`whisperback_completed`) instead. In this case, skip PO files for
[[translation teams that use Git|contribute/how/translate#translate]].
Add and commit.
"${RELEASE_CHECKOUT:?}"/import-translations && \
"${RELEASE_CHECKOUT:?}"/submodules/jenkins-tools/slaves/check_po
Then check the PO files:
Then, `git rm` the PO files that have issues (alternatively, if you
feel like it you can fix them but your changes will be overwritten
next time we import translations from Transifex).
"${RELEASE_CHECKOUT:?}"/submodules/jenkins-tools/slaves/check_po
And finally, commit:
Correct any displayed error, then commit the changes if any.
git add po && git commit \
-m "Update POT and PO files, pull updated translations from Transifex."
Then see the relevant release processes, and upload the packages to
the release branch's custom APT suite:
......
......@@ -58,8 +58,7 @@ upstream tarball, update `debian/changelog`:
git checkout debian && \
gbp import-orig --upstream-vcs-tag=Tails-perl5lib_$VERSION \
../Tails-perl5lib-$VERSION.tar.gz && \
gbp dch --auto && \
dch -e
gbp dch --auto --spawn-editor=always
(Do not forget to set the appropriate release.)
......@@ -74,7 +73,8 @@ Commit `debian/changelog`:
Git-Dch: Ignore
"
Build a Debian package (use a Stretch/amd64 chroot):
Build a Debian package (use a Stretch/amd64 chroot with `stretch-backports`
enabled):
gbp buildpackage
......
......@@ -7,7 +7,7 @@ Pre-requisites
* a Debian Stretch (or newer) system
* Tails' `devel` APT suite enabled
* the right version of the `tails-perl5lib` package installed
* the latest version of the `tails-perl5lib` package installed
Install build and test dependencies
===================================
......@@ -32,13 +32,11 @@ Export new upstream version number:
export VERSION=XXX
Update version number in `bin/tails-persistence-setup`:
perl -pi -E 's,^Version [0-9.]+,Version $ENV{VERSION},' bin/tails-persistence-setup
perl -pi -E "s,^our \\\$VERSION = '[0-9.]+';\$,our \\\$VERSION = '$VERSION';," bin/tails-persistence-setup
Commit all files that need to be:
Update version number in `bin/tails-persistence-setup` and
commit all files that need to be:
perl -pi -E 's,^Version [0-9.]+,Version $ENV{VERSION},' bin/tails-persistence-setup && \
perl -pi -E "s,^our \\\$VERSION = '[0-9.]+';\$,our \\\$VERSION = '$VERSION';," bin/tails-persistence-setup && \
git commit bin/tails-persistence-setup -m "tails-persistent-setup $VERSION"
Optionally, run the upstream test suite (it is run as part of the
......@@ -70,7 +68,7 @@ Checkout the Debian packaging branch and import the new upstream tarball:
Update `debian/changelog`:
gbp dch && dch -e
gbp dch --auto --spawn-editor=always
(Do not forget to set the appropriate release.)
......@@ -82,9 +80,9 @@ Commit `debian/changelog`:
Git-Dch: Ignore
"
Build a Debian package (use a Stretch/amd64 chroot, that
has either tails-perl5lib installed, or the Tails APT repository
configured):
Build a Debian package (use a Stretch/amd64 chroot, that has
`stretch-backports` enabled and on top of that: either tails-perl5lib
installed or the Tails APT repository configured):
gbp buildpackage
......
......@@ -14,33 +14,17 @@ Update POT and PO files
) && \
git commit po -m 'Update POT and PO files.'
Prepare a release
=================
Run `./scripts/release.sh` and follow the instructions.
git checkout master && ./scripts/release.sh
… then follow the instructions, making sure you set the appropriate
release on the first line of the new changelog entry.
Update the Debian package
=========================
Checkout the correct branch:
git checkout master
Update `debian/changelog`:
gbp dch
(Do not forget to set the appropriate release.)
Commit the changelog:
git commit debian/changelog \
-m "$(dpkg-parsechangelog -SSource) ($(dpkg-parsechangelog -SVersion))
Git-Dch: Ignore
"
Build a new Debian package (use a Stretch/amd64 chroot):
gbp buildpackage
......
......@@ -44,16 +44,11 @@ Export new upstream version number:
Export location of a checkout of the branch of the main Tails Git
repository used to prepare the release (typically `stable` or `testing`):
export TAILS_GIT_CHECKOUT=XXX
export TAILS_GIT_CHECKOUT="$RELEASE_CHECKOUT"
Export source date epoch:
export SOURCE_DATE_EPOCH=$(date \
--utc \
--date="$(dpkg-parsechangelog \
--file "$TAILS_GIT_CHECKOUT/debian/changelog" \
--show-field=Date)" \
+%s)
export SOURCE_DATE_EPOCH=$(date --utc +%s)
Update version number in `bin/tails-create-iuk`, commit all files that
need to be.
......@@ -72,8 +67,8 @@ Run the upstream test suite:
umask 077
# Run the test suite
NODE_PATH="/path/to/tails.git/submodules/mirror-pool-dispatcher/lib/js" \
PATH="/path/to/tails.git/submodules/mirror-pool-dispatcher/bin:$PATH" \
NODE_PATH="${TAILS_GIT_CHECKOUT}/submodules/mirror-pool-dispatcher/lib/js" \
PATH="${TAILS_GIT_CHECKOUT}/submodules/mirror-pool-dispatcher/bin:$PATH" \
RELEASE_TESTING=1 \
LC_ALL=C \
dzil test
......@@ -94,8 +89,7 @@ upstream tarball, update `debian/changelog`:
git checkout debian && \
gbp import-orig --upstream-vcs-tag=$VERSION \
../Tails-IUK-$VERSION.tar.gz && \
gbp dch --auto && \
dch -e
gbp dch --auto --spawn-editor=always
(Do not forget to set the appropriate release.)
......@@ -110,9 +104,9 @@ Commit `debian/changelog`:
Git-Dch: Ignore
"
Build a Debian package (use a Stretch chroot with the right version of
`tails-perl5lib` installed), add a signed tag to the repository and
push the changes:
Build a Debian package (use a Stretch/amd64 chroot, that has
`stretch-backports` enabled and on top of that: either tails-perl5lib
installed or the Tails APT repository configured):
gbp buildpackage && \
gbp buildpackage --git-tag-only --git-sign-tags && \
......
Supports Markdown
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