You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2022/03/07 20:00:02 UTC
svn commit: r1898712 - in /httpd/dev-tools/release: README check-cves.sh r0-make-candidate.sh r1-make-tars.sh r2-prep-vote.sh r3-push-release-tars.sh reset-candidate.sh
Author: icing
Date: Mon Mar 7 20:00:02 2022
New Revision: 1898712
URL: http://svn.apache.org/viewvc?rev=1898712&view=rev
Log:
*) release: rename of candidate tag to suffix -candidate
Modified:
httpd/dev-tools/release/README
httpd/dev-tools/release/check-cves.sh
httpd/dev-tools/release/r0-make-candidate.sh
httpd/dev-tools/release/r1-make-tars.sh
httpd/dev-tools/release/r2-prep-vote.sh
httpd/dev-tools/release/r3-push-release-tars.sh
httpd/dev-tools/release/reset-candidate.sh
Modified: httpd/dev-tools/release/README
URL: http://svn.apache.org/viewvc/httpd/dev-tools/release/README?rev=1898712&r1=1898711&r2=1898712&view=diff
==============================================================================
--- httpd/dev-tools/release/README (original)
+++ httpd/dev-tools/release/README Mon Mar 7 20:00:02 2022
@@ -17,7 +17,7 @@ Usage overview:
On success:
> $DEV_TOOLS/release/r3-push-release-tars.sh
# tars are moved to https://dist.apache.org/repos/dist/release/
- # the SVN tags/candidate-$FULL_VERSION is moved to tags/$VERSION
+ # the SVN tags/$FULL_VERSION-candidate is moved to tags/$VERSION
# wait for files to distribute on mirrors (2021? Do we use FedEx?)
> $DEV_TOOLS/release/r4-stage-release.sh
# ALL CHANGES HERE ARE LOCAL ONLY
@@ -72,23 +72,23 @@ Handling of VERSIONs:
your local checkout (httpd: include/ap_release.h).
What r0-make-candidate.sh does:
- - copies the current REVISION of your checkout to ^/httpd/httpd/tags/candidate-$VERSION
+ - copies the current REVISION of your checkout to ^/httpd/httpd/tags/$VERSION-candidate
- Patches the $VERSION everywhere in the sources where needed
- Rebuilds the docs/manual, so the version and current year is properly reflected there
- - svn commits this to tags/candidate-$VERSION
+ - svn commits this to tags/$VERSION-candidate
NOTE:
- - it works on a checkout it creates locally in dist/candidate-$VERSION, it
+ - it works on a checkout it creates locally in dist/$VERSION-candidate, it
does not modify the checkout you run this in. Once the tag is created, any
further modifications of your local checkout won't affect it.
- Say, you have not called a vote yet and someone comes with a late, important
commit to the branch, you should:
- * remove ^/httpd/httpd/tags/candidate-$VERSION in SVN
+ * remove ^/httpd/httpd/tags/$VERSION-candidate in SVN
* remove the dist directory
* svn update your local checkout
* run make-candidate.sh again
What r1-make-tars.sh does:
- - svn exports the candidate from ^/httpd/httpd/tags/candidate-$VERSION
+ - svn exports the candidate from ^/httpd/httpd/tags/$VERSION-candidate
into dist/httpd-$VERSION
- retrieves the latest APR/APU sources and adds them to dist/httpd-$VERSION/srclib
- runs "buildconf" on the export
@@ -117,7 +117,7 @@ What r3-push-release-tars.sh does:
httpd-2.4.49.at.gz in the release dir.
- It moves the CURRENT-IS-$VERSION file
- It adds CHANGES_$VERSION and updates CHANGES_$v_major.$v_minor
- - It moves SVN tags/candidate-$FULL_VERSION tag to tags/$VERSION
+ - It moves SVN tags/$FULL_VERSION-candidate tag to tags/$VERSION
- NO security related information is added yet.
What r4-stage-release.sh does:
Modified: httpd/dev-tools/release/check-cves.sh
URL: http://svn.apache.org/viewvc/httpd/dev-tools/release/check-cves.sh?rev=1898712&r1=1898711&r2=1898712&view=diff
==============================================================================
--- httpd/dev-tools/release/check-cves.sh (original)
+++ httpd/dev-tools/release/check-cves.sh Mon Mar 7 20:00:02 2022
@@ -35,7 +35,7 @@ detect_checkout
detect_version ""
PROJECT=`basename $SVN_BASE`
-SVN_DEST="tags/candidate-${FULL_VERSION}"
+SVN_DEST="tags/${FULL_VERSION}-candidate"
SVN_RELEASE="tags/${VERSION}"
DIST_DIR="dist"
Modified: httpd/dev-tools/release/r0-make-candidate.sh
URL: http://svn.apache.org/viewvc/httpd/dev-tools/release/r0-make-candidate.sh?rev=1898712&r1=1898711&r2=1898712&view=diff
==============================================================================
--- httpd/dev-tools/release/r0-make-candidate.sh (original)
+++ httpd/dev-tools/release/r0-make-candidate.sh Mon Mar 7 20:00:02 2022
@@ -48,8 +48,8 @@ detect_checkout
assure_clean_checkout
detect_version $1
-SVN_DEST="tags/candidate-${FULL_VERSION}"
-DEST_DIR="${DIST_DIR}/candidate-${FULL_VERSION}"
+SVN_DEST="tags/${FULL_VERSION}-candidate"
+DEST_DIR="${DIST_DIR}/${FULL_VERSION}-candidate"
# find out which CVEs are ready and will be reporting in this candidate
calc_ready_CVE_DIRS "${DIST_DIR}/pmc"
Modified: httpd/dev-tools/release/r1-make-tars.sh
URL: http://svn.apache.org/viewvc/httpd/dev-tools/release/r1-make-tars.sh?rev=1898712&r1=1898711&r2=1898712&view=diff
==============================================================================
--- httpd/dev-tools/release/r1-make-tars.sh (original)
+++ httpd/dev-tools/release/r1-make-tars.sh Mon Mar 7 20:00:02 2022
@@ -19,7 +19,7 @@ usage () {
cat <<EOF 1>&2
usage: $0 [options] [version]
create the release tars from a SVN candidate. The candidate is expected
- to be found in SVN at 'tags/candidate-$version', as prepared by the
+ to be found in SVN at 'tags/$version-candidate', as prepared by the
'make-candidate.sh' script.
If no version is given, the current version in the checkout is used.
Arguments:
@@ -48,7 +48,7 @@ source `dirname $0`/env.sh
detect_checkout
detect_version $1
-SVN_DEST="tags/candidate-${FULL_VERSION}"
+SVN_DEST="tags/${FULL_VERSION}-candidate"
cat <<EOF
creating release tars:
Modified: httpd/dev-tools/release/r2-prep-vote.sh
URL: http://svn.apache.org/viewvc/httpd/dev-tools/release/r2-prep-vote.sh?rev=1898712&r1=1898711&r2=1898712&view=diff
==============================================================================
--- httpd/dev-tools/release/r2-prep-vote.sh (original)
+++ httpd/dev-tools/release/r2-prep-vote.sh Mon Mar 7 20:00:02 2022
@@ -40,7 +40,7 @@ source `dirname $0`/env.sh
detect_checkout
detect_version $1
-SVN_DEST="tags/candidate-${FULL_VERSION}"
+SVN_DEST="tags/${FULL_VERSION}-candidate"
EXP_DIRNAME="${PROJECT}-${VERSION}"
Modified: httpd/dev-tools/release/r3-push-release-tars.sh
URL: http://svn.apache.org/viewvc/httpd/dev-tools/release/r3-push-release-tars.sh?rev=1898712&r1=1898711&r2=1898712&view=diff
==============================================================================
--- httpd/dev-tools/release/r3-push-release-tars.sh (original)
+++ httpd/dev-tools/release/r3-push-release-tars.sh Mon Mar 7 20:00:02 2022
@@ -42,7 +42,7 @@ source `dirname $0`/env.sh
detect_checkout
detect_version $1
-SVN_DEST="tags/candidate-${FULL_VERSION}"
+SVN_DEST="tags/${FULL_VERSION}-candidate"
SVN_RELEASE="tags/${VERSION}"
svn ls "$SVN_BASE/$SVN_DEST" >/dev/null 2>&1 ||
Modified: httpd/dev-tools/release/reset-candidate.sh
URL: http://svn.apache.org/viewvc/httpd/dev-tools/release/reset-candidate.sh?rev=1898712&r1=1898711&r2=1898712&view=diff
==============================================================================
--- httpd/dev-tools/release/reset-candidate.sh (original)
+++ httpd/dev-tools/release/reset-candidate.sh Mon Mar 7 20:00:02 2022
@@ -43,7 +43,7 @@ source `dirname $0`/env.sh
detect_checkout
detect_version $1
-SVN_DEST="tags/candidate-${FULL_VERSION}"
+SVN_DEST="tags/${FULL_VERSION}-candidate"
SVN_RELEASE="tags/${VERSION}"
echo "You are about to remove any intermediary files for ${PROJECT}-${FULL_VERSION}"