svn commit: r1909177 - in /apr/site/trunk/release: README.md r5-commit-staged-release.sh

[co...@apache.org]

Author: covener
Date: Sun Apr 16 14:38:01 2023
New Revision: 1909177

URL: http://svn.apache.org/viewvc?rev=1909177&view=rev
Log:
port r5, update docs

Added:
    apr/site/trunk/release/r5-commit-staged-release.sh   (with props)
Modified:
    apr/site/trunk/release/README.md

Modified: apr/site/trunk/release/README.md
URL: http://svn.apache.org/viewvc/apr/site/trunk/release/README.md?rev=1909177&r1=1909176&r2=1909177&view=diff
==============================================================================
--- apr/site/trunk/release/README.md (original)
+++ apr/site/trunk/release/README.md Sun Apr 16 14:38:01 2023
@@ -27,9 +27,10 @@
 8. If unsuccessful, cleanup https://dist.apache.org/repos/dist/dev/apr and repeat with a later rcX.
 9. On successful vote:
    1. Run `$APR_DEV_TOOLS/r3-push-release-tars.sh` from your APR checkout to fixup and move the artifacts from dev/ to release
-   2. Wait for dlcdn links (immediate) and directory listings (up to 2 hours) to show the new files.
-      - update the download and index xdocs/ as in r1840948
-   3. Send announce emails to apr and announce@ (see r6-announce.sh in this dir)
+   2. Run `$APR_DEV_TOOLS/r4-stage-release.sh` to stage an update to the project checkout and website.  Review the changes.
+   3. Wait for dlcdn links (immediate) and directory listings (up to 2 hours) to show the new files.
+   4. Run `$APR_DEV_TOOLS/r5-commit-staged-release.sh` to update the website and dev tree
+   5. Run r6-announce.sh from this dir to generate announce emails (output will tell you what to do)
 
 ## 2) If there were CVES
 

Added: apr/site/trunk/release/r5-commit-staged-release.sh
URL: http://svn.apache.org/viewvc/apr/site/trunk/release/r5-commit-staged-release.sh?rev=1909177&view=auto
==============================================================================
--- apr/site/trunk/release/r5-commit-staged-release.sh (added)
+++ apr/site/trunk/release/r5-commit-staged-release.sh Sun Apr 16 14:38:01 2023
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# Commit staged release changes to various SVN repositories and the
+# project website
+
+#Useful for debugging
+#set -x
+
+#Bail when non-zero return codes are encountered
+set -e
+
+usage () {
+    cat <<EOF 1>&2
+usage: $0 [options] [version]
+  Commit staged release changes to project distribution, source repositories
+  and web site.
+  Arguments:
+    version        as 'm.n.p(-suffix)?', the version to use.
+  Options:
+    -h             print usage information
+    -u user-id     your apache user-id, e.g 'ylavic'
+EOF
+  exit 1
+}
+
+asf_id="$USER"
+
+while getopts "hu:" opt; do
+    case $opt in
+        h)  usage
+            ;;
+        u)  asf_id="$OPTARG"
+            ;;
+    esac
+done
+shift $((OPTIND-1))
+
+source `dirname $0`/common-lib.sh
+source `dirname $0`/env.sh
+
+detect_checkout
+detect_version $1
+
+AO_DIST_PATH="dist/apache.org-dist"
+AO_DIST_RELEASE_PATH="${AO_DIST_PATH}/release/${PROJECT}"
+
+SVN_SITE_CONTENT_URL="${SVN_SITE_URL}/${PROJECT}/site/trunk/content/"
+DIST_SITEPATH="${DIST_DIR}/site"
+
+echo "updating local checkout"
+svn up
+
+test -d "${DIST_SITEPATH}" ||
+  fail "staged changes for project site not found in ${DIST_SITEPATH}"
+
+echo
+echo "PENDING REPOSITORY CHANGES"
+echo "--------"
+echo "SVN changes staged in ${DIST_SITEPATH}"
+(cd "${DIST_SITEPATH}" && svn diff)
+echo "--------"
+echo "SVN changes staged in local checkout for ${SVN_URL}"
+svn diff
+
+if ask_yes_no "Do you want to commit these changes?"; then
+  echo "WARNING: this is quite irreversible!"
+  if ask_yes_no "Do you REALLY want to commit these changes?"; then
+    MSG="publishing release ${PROJECT}-${VERSION}"
+
+    # echo nop: svn commit -m "${MSG}" .
+    svn commit -m "${MSG}" .
+    # echo "nop: cd ${DIST_SITEPATH}; git commit -m ${MSG}"
+    svn commit -m "${MSG}" "${DIST_SITEPATH}"
+    # success exit
+    save_version
+    exit 0
+  fi
+fi
+# failure exit
+exit 1

Propchange: apr/site/trunk/release/r5-commit-staged-release.sh
------------------------------------------------------------------------------
    svn:executable = *