Merge pull request #275 from github/sync-public-to-private

Sync public to private

Author: gamefiend

.github/workflows/stale-support-escalation.yml

@@ -148,6 +148,8 @@ fi
 echo "$GHE_SNAPSHOT_TIMESTAMP $$" > ../in-progress
 echo "$GHE_SNAPSHOT_TIMESTAMP $$" > ${GHE_DATA_DIR}/in-progress-backup
 
+START_TIME=$(date +%s)
+echo 'Start time:' $START_TIME
 echo "Starting backup of $GHE_HOSTNAME with backup-utils v$BACKUP_UTILS_VERSION in snapshot $GHE_SNAPSHOT_TIMESTAMP"
 
 # Perform a host connection check and establish the remote appliance version.
@@ -263,6 +265,10 @@ if [ -z "$failures" ]; then
   ghe-prune-snapshots
 fi
 
+END_TIME=$(date +%s)
+echo 'End time:' $END_TIME
+echo 'Runtime:' $(($END_TIME - $START_TIME)) 'seconds'
+
 echo "Completed backup of $GHE_HOSTNAME in snapshot $GHE_SNAPSHOT_TIMESTAMP at $(date +"%H:%M:%S")"
 
 # Exit non-zero and list the steps that failed.

.github/workflows/stale.yml

@@ -68,7 +68,7 @@ if [ $rc -ne 0 ]; then
     echo "$output" 1>&2
     echo "Error: ssh connection with '$host' failed" 1>&2
     echo "Note that your SSH key needs to be setup on $host as described in:" 1>&2
-    echo "* https://enterprise.github.com/help/articles/adding-an-ssh-key-for-shell-access" 1>&2
+    echo "* https://docs.github.com/enterprise-server/admin/configuration/configuring-your-enterprise/accessing-the-administrative-shell-ssh" 1>&2
     ;;
   101)
     echo "Error: couldn't read GitHub Enterprise Server fingerprint on '$host' or this isn't a GitHub appliance." 1>&2
@@ -131,7 +131,7 @@ fi
 
 # backup-utils 2.13 onwards limits support to the current and previous two releases
 # of GitHub Enterprise Server.
-supported_minimum_version="3.5.0"
+supported_minimum_version="3.6.0"
 
 if [ "$(version $version)" -ge "$(version $supported_minimum_version)" ]; then
   supported=1

RELEASING.md

@@ -6,7 +6,7 @@
 #/ Note that the GitHub Enterprise host must be reachable and your SSH key must
 #/ be setup as described in the following help article:
 #/
-#/ <https://enterprise.github.com/help/articles/adding-an-ssh-key-for-shell-access>
+#/ <https://docs.github.com/enterprise-server/admin/configuration/configuring-your-enterprise/accessing-the-administrative-shell-ssh >
 #/
 #/ OPTIONS:
 #/   -c | --config       Restore appliance settings and license in addition to
@@ -89,11 +89,11 @@ done
 start_cron () {
   echo "Starting cron ..."
   if $CLUSTER; then
-    if ! ghe-ssh "$GHE_HOSTNAME" -- "ghe-cluster-each -- sudo service cron start"; then
+    if ! ghe-ssh "$GHE_HOSTNAME" -- "ghe-cluster-each -- sudo timeout 120s service cron start"; then
       echo "* Warning: Failed to start cron on one or more nodes"
     fi
   else
-    if ! ghe-ssh "$GHE_HOSTNAME" -- "sudo service cron start"; then
+    if ! ghe-ssh "$GHE_HOSTNAME" -- "sudo timeout 120s service cron start"; then
       echo "* Warning: Failed to start cron"
     fi
   fi

bin/ghe-backup

@@ -1,3 +1,7 @@
+github-backup-utils (3.8.0) focal; urgency=medium
+
+ -- Daniel Johnson <[email protected]>  Tue, 07 Feb 2023 21:43:26 +0000
+
 github-backup-utils (3.7.0) UNRELEASED; urgency=medium
 
 

bin/ghe-host-check

@@ -6,12 +6,11 @@ storage and must have network connectivity with the GitHub Enterprise Server app
 ## Backup host requirements
 
 Backup host software requirements are modest: Linux or other modern Unix operating
-system with [bash][1], [git][2], [OpenSSH][3] 5.6 or newer, and [rsync][4] v2.6.4 or newer.
+system (Ubuntu is highly recommended) with [bash][1], [git][2], [OpenSSH][3] 5.6 or newer, [rsync][4] v2.6.4 or newer, and [jq][11] v1.5 or newer.
 
 The parallel backup and restore feature will require [GNU awk][10] and [moreutils][9] to be installed.
 
-We encourage the use of [Docker](docker.md) if your backup host doesn't meet these
-requirements, or if Docker is your preferred platform.
+We encourage the use of [Docker](docker.md), as it ensures compatible versions of the aforementioned software are available to backup-utils.
 
 The backup host must be able to establish outbound network connections to the
 GitHub appliance over SSH. TCP port 122 is used to backup GitHub Enterprise Server.
@@ -79,3 +78,4 @@ Due to how some components of Backup Utilities (e.g. MSSQL) take incremental bac
 [8]: https://help.github.com/enterprise/admin/guides/installation/upgrade-requirements/
 [9]: https://joeyh.name/code/moreutils
 [10]: https://www.gnu.org/software/gawk
+[11]: https://stedolan.github.io/jq/

bin/ghe-restore

@@ -1 +1 @@
-3.7.0
+3.8.0