Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AC65D2004F2 for ; Sat, 26 Aug 2017 11:59:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AAFE8169A41; Sat, 26 Aug 2017 09:59:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CA79116993C for ; Sat, 26 Aug 2017 11:59:20 +0200 (CEST) Received: (qmail 50282 invoked by uid 500); 26 Aug 2017 09:59:20 -0000 Mailing-List: contact commits-help@tamaya.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tamaya.incubator.apache.org Delivered-To: mailing list commits@tamaya.incubator.apache.org Received: (qmail 49923 invoked by uid 99); 26 Aug 2017 09:59:18 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Aug 2017 09:59:18 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 41ED0183C68 for ; Sat, 26 Aug 2017 09:59:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 8SeZQLFJtkPc for ; Sat, 26 Aug 2017 09:59:13 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 2103E5F5FD for ; Sat, 26 Aug 2017 09:59:11 +0000 (UTC) Received: (qmail 49597 invoked by uid 99); 26 Aug 2017 09:59:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Aug 2017 09:59:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1E6B6F5F34; Sat, 26 Aug 2017 09:59:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: plexus@apache.org To: commits@tamaya.incubator.apache.org Date: Sat, 26 Aug 2017 09:59:09 -0000 Message-Id: <1f3b2fed1ba7484a932f91fb0e65d245@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/15] incubator-tamaya-site git commit: Overhauled the section 'Perform the release' and replaced the sections on updating the website and on the announcement by a new section called 'Updating the website and announcing the release'. archived-at: Sat, 26 Aug 2017 09:59:21 -0000 Repository: incubator-tamaya-site Updated Branches: refs/heads/master 1391ae8ec -> 3acfb6016 Overhauled the section 'Perform the release' and replaced the sections on updating the website and on the announcement by a new section called 'Updating the website and announcing the release'. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/commit/3acfb601 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/tree/3acfb601 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/diff/3acfb601 Branch: refs/heads/master Commit: 3acfb6016c945338a2fadd7d7275b445f158bc39 Parents: cb92dd6 Author: Oliver B. Fischer Authored: Sun Aug 13 12:51:20 2017 +0200 Committer: Oliver B. Fischer Committed: Sat Aug 26 11:54:47 2017 +0200 ---------------------------------------------------------------------- content/release-guide.adoc | 123 ++++++++++++++++++++++++++++++++-------- 1 file changed, 98 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/3acfb601/content/release-guide.adoc ---------------------------------------------------------------------- diff --git a/content/release-guide.adoc b/content/release-guide.adoc index 542b23c..28d2d54 100644 --- a/content/release-guide.adoc +++ b/content/release-guide.adoc @@ -536,61 +536,134 @@ Z -1 votes: <5> -== Perform the release +== Performing the release -If the binding majority approved the vote on both lists continue: +The actually release process can be started if the binding majority +of IPMC members have approved the release candidate. -* Login to https://repository.apache.org/ and _release_ the repository -* Rename the vote branch: +The first task is to create branch for the new release +out of the branch, created for the vote on the release candidate. -[listing,text] +=== Tag and branch for the release + +Creating this branch requires multiple commands, as Git does not +allow to simply rename a remote branch. The listing below shows +which commands are needed to create a branch for the new release + +[listing,shell] +.Renaming the branch of the release candidate ---- -$ git branch -m vote01-tamaya-[release-version] tamaya-[release-version] +$ git checkout master <1> +$ git branch release-[version] vote-[version]-[attempt] <2> <3> <4> +$ git push origin release-[version]:refs/heads/release-[version] <5> +$ git push origin :vote-[version]-[attempt] <6> +$ git branch -D vote-[version]-[attempt] <7> +$ git checkout -b release-[version] --track origin/release-[version] <8> ---- +<1> Switching back to `master` +<2> Creating a release branch out of the vote branch +<3> Replace _version_ by the version number of the release +<4> Replace _attempt_ by the number of the successful vote attempt +<5> Pushing the new branch under the same name to the blessed repository +<6> Delete the vote branch in the blessed remote repository +<7> Delete the branch locally +<8> Checkout the new release branch and set the corresponding + remote branch as upstream branch + -* Add a release tag: +Now create a new tag for the release based on the exsting tag +for the release candidate and delete the tag made for +the release candidate: +[listing,shell] ---- -$ git tag -a tamaya-[release-version] +$ git tag release-[version] vote-[version]-[attempt] <1> <2> <3> +$ git tag -d vote-[version]-[attempt] <4> +$ git push origin :vote-[version]-[attempt] <5> +$ git push --tags origin <6> ---- +<1> Creating a release tag for the release +<2> Replace _version_ by the version number of the release +<3> Replace _attempt_ by the number of the successful vote attempt +<4> Delete the tag made for the vote locally +<5> Delete tag tag mode for the vote in the blessed remote repository +<6> Push the new tag to the remote repository -* Merge master with the new prepared version: +Now you can merge the new release branch with the prepared +development version to master. [listing,text] +.Merging the release branch to `master` ---- $ git checkout master -$ git merge tamaya-[release-version] -$ git push origin tamaya-[release-version] +$ git merge release-[version] $ git push origin master ---- -* Close the release and corresponding tickets at JIRA +=== Cleanup Jira + +Login into https://issues.apache.org/jira/browse/tamaya[Apache's Jira] and +close all issues in the +https://issues.apache.org/jira/browse/tamaya[Tamaya project^]. + +=== Release the staging repository + +Login into https://repository.apache.org/[Apaches Nexus^] and +release to staging repository for the new release. -* Wait some minutes and check http://repo2.maven.org/maven2/org/apache/tamaya[^] +Then wait some minutes and check if the artifacts have become +available at http://repo2.maven.org/maven2/org/apache/tamaya[^]. -* Upload the distribution Artifacts +=== Releasing the distribution artifacts + +The source distribution of the release candidate must now be +moved from the dev section of the distribution repository +to the release section. + +An easy way to achive this is to use the `svn mv` command +only with remote URLs. Before you move the distribution artifacts, +make sure the the directory for the version of the projects exists. [listing,text] +.Checking if the target directory exists in SVN ---- -$ svn co https://dist.apache.org/repos/dist/release/incubator/tamaya/ -$ mkdir [version] -# add and commit the artifacts (*source-release.zip, *bin-release.zip + asc, md5, sha1) -# use the artifacts from: -# http://repo1.maven.org/maven2/org/apache/tamaya/tamaya-distribution/[version]/ +$ svn ls https://dist.apache.org/repos/dist/release/incubator/tamaya ---- +If the directory does not exists, create it. -== Updating the Tamaya Project Site +[listing,text] +.Creating the directory for the version of the release +---- +$ svn mkdir https://dist.apache.org/repos/dist/release/incubator/tamaya/[versio] <1> +---- +<1> Replace _version_ by the version number of the release. -Basically the new site should be directly deployable, just execute +Now move all distribution artifacts from the dev section to the release +section. [listing,text] +.Moving the source distribution to the release section with SVN +---- +$ svn mv \ + https://dist.apache.org/repos/dist/dev/incubator/tamaya/[version]/[project] \ <1> <2> + https://dist.apache.org/repos/dist/release/incubator/tamaya/[version]/[project] +---- +<1> Replace _version_ by the version number of the release. +<2> Replace _project_ by the name of the project. + +To be sure that everything wents well, perform a checkout of the SVN +repository for the release section and check if everything is there. + +[listing,shell] ---- -$ mvn site site:deploy +$ svn checkout https://dist.apache.org/repos/dist/release/incubator/tamaya +$ cd tamaya +$ ls -Rlah ---- -== Announce the new version +== Updating the website and announcing the release -Announce the new version on @TamayaConf and other social media channels. -Also drop a short mail on the mailing list. +Coordindate on the developers mailinglist the update of the website +for the new version and the announcement of the new version.