Commit e0976d3d authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'stable' into devel

parents b3e51f09 8c15633f
......@@ -79,18 +79,13 @@ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef chroot/usr/share/amnesi
export MKSQUASHFS_OPTIONS
# get git branch or tag so we can set the basename appropriately, i.e.:
# * if we build from a tag: tails-$ARCH-$TAG.iso
# * if we build from a branch: tails-$ARCH-$BRANCH-$VERSION-$DATE.iso
# * if Jenkins builds from a branch: tails-$ARCH-$BRANCH-$VERSION-$TIME-$COMMIT.iso
# * if we build from a tag: tails-$ARCH-$TAG.iso
# * otherwise: tails-$ARCH-$BRANCH-$VERSION-$TIME-$COMMIT.iso
if GIT_REF="$(git symbolic-ref HEAD)"; then
GIT_BRANCH="${GIT_REF#refs/heads/}"
CLEAN_GIT_BRANCH=$(echo "$GIT_BRANCH" | sed 's,/,_,g')
if [ -n "$JENKINS_URL" ]; then
GIT_SHORT_ID="$(git rev-parse --short HEAD)"
BUILD_BASENAME="tails-${LB_ARCHITECTURE}-${CLEAN_GIT_BRANCH}-${AMNESIA_VERSION}-${AMNESIA_NOW}-${GIT_SHORT_ID}"
else
BUILD_BASENAME="tails-${LB_ARCHITECTURE}-${CLEAN_GIT_BRANCH}-${AMNESIA_VERSION}-${AMNESIA_TODAY}"
fi
GIT_SHORT_ID="$(git rev-parse --short HEAD)"
BUILD_BASENAME="tails-${LB_ARCHITECTURE}-${CLEAN_GIT_BRANCH}-${AMNESIA_VERSION}-${AMNESIA_NOW}-${GIT_SHORT_ID}"
else
GIT_CURRENT_COMMIT="$(git rev-parse HEAD)"
if GIT_TAG="$(git describe --tags --exact-match ${GIT_CURRENT_COMMIT})"; then
......
......@@ -414,8 +414,16 @@ Better catch this before people spend time doing manual tests.
Build the almost-final image
----------------------------
[[Build images|contribute/build]] and carefully read the build logs to
make sure nothing bad happened.
* Check out the release tag:
git checkout "${TAG}"
* [[Build images|contribute/build]] and carefully read the build logs to
make sure nothing bad happened.
* Check out the release branch again:
git checkout "${RELEASE_BRANCH}"
SquashFS file order
-------------------
......@@ -457,9 +465,17 @@ suite should be ready, so it is time to:
git tag -f -u "$TAILS_SIGNATURE_KEY" \
-m "tagging version ${VERSION}" "${TAG}" && \
git push --tags -f
* check out the release tag:
git checkout "${TAG}"
* build the final image!
* check out the release branch again:
git checkout "${RELEASE_BRANCH}"
<a id="prepare-iuk"></a>
Generate the OpenPGP signatures and Torrents
......@@ -470,11 +486,10 @@ First, create a directory with a suitable name and go there:
mkdir "$ISOS/tails-i386-$VERSION" && \
cd "$ISOS/tails-i386-$VERSION"
Second, copy the built image to this brand new directory.
Then, rename it:
Second, move the built image to this brand new directory:
mv "$ARTIFACTS/tails-i386-${RELEASE_BRANCH}-$VERSION-"*".iso" \
"$ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso"
mv "$ARTIFACTS/tails-i386-$VERSION.iso" \
"$ISOS/tails-i386-$VERSION/"
Third, generate detached OpenPGP signatures for the image to be
published, in the same directory as the image and with a `.sig`
......@@ -723,7 +738,7 @@ In order to get any new documentation into the website, merge either
Rename the `.packages` file to remove the `.iso` and build date parts
of its name:
mv "$ARTIFACTS"/tails-i386-"${RELEASE_BRANCH}-$VERSION"-*.iso.packages \
mv "$ARTIFACTS"/tails-i386-"-$VERSION"-*.iso.packages \
"$ARTIFACTS/tails-i386-$VERSION.packages"
Copy the `.iso.sig`, `.packages`, `.torrent` and `.torrent.sig` files
......
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