Merge pull request #184 from github/sync-with-public-repo

Sync with public repo for 2.22 release

Author: cjonsmith

.github/workflows/lint.yml

@@ -1,7 +1,7 @@
 name: Lint Code Base
 
 on:
-  push:
+  pull_request:
     branches-ignore:
       - 'master'
 

.github/workflows/main.yml

@@ -1,6 +1,6 @@
 name: Test and build
 
-on: [push]
+on: [pull_request]
 
 jobs:
   build:
@@ -10,12 +10,11 @@ jobs:
         # os: ['ubuntu-20.04', 'ubuntu-18.04', 'ubuntu-16.04', 'macos-latest']
       fail-fast: false
     runs-on: ${{ matrix.os }}
-
+      
     steps:
     - name: Install Dependencies (Linux)
       run: |
         sudo apt-get update -y
-        sudo apt-get purge parallel
         sudo apt-get install -y devscripts debhelper moreutils fakeroot jq pigz
         wget "https://github.com/koalaman/shellcheck/releases/download/v0.7.0/shellcheck-v0.7.0.linux.x86_64.tar.xz"
         tar --xz -xvf "shellcheck-v0.7.0.linux.x86_64.tar.xz"

RELEASING.md

@@ -8,6 +8,8 @@ There is no need to align Backup Utilities patch releases with GitHub Enterprise
 
 When making a `.0` release, you will need to specify the minimum supported version of GitHub Enterprise Server that that release supports.
 
+Only repo administrator is allowed to run the release script, otherwise it will fail.
+
 ## Pre-release Actions
 
 Prior to making a release,

bin/ghe-host-check

@@ -113,7 +113,7 @@ fi
 
 # backup-utils 2.13 onwards limits support to the current and previous two releases
 # of GitHub Enterprise Server.
-supported_minimum_version="2.18.0"
+supported_minimum_version="2.19.0"
 
 if [ "$(version $version)" -ge "$(version $supported_minimum_version)" ]; then
   supported=1

bin/ghe-restore

@@ -195,6 +195,8 @@ if is_external_database_snapshot && ! $instance_configured && ! $FORCE; then
 fi
 
 # Log restore start message locally and in /var/log/syslog on remote instance
+START_TIME=$(date +%s)
+echo 'Start time:' $START_TIME
 echo "Starting restore of $GHE_HOSTNAME with backup-utils v$BACKUP_UTILS_VERSION from snapshot $GHE_RESTORE_SNAPSHOT"
 ghe_remote_logger "Starting restore from $(hostname) with backup-utils v$BACKUP_UTILS_VERSION / snapshot $GHE_RESTORE_SNAPSHOT ..."
 
@@ -448,8 +450,13 @@ else
   ghe-ssh "$GHE_HOSTNAME" -- /bin/sh 1>&3
 fi
 
+END_TIME=$(date +%s)
+echo 'End time:' $END_TIME
+echo 'Runtime:' $(($END_TIME - $START_TIME)) 'seconds'
+
 echo "Restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT finished."
 
 if ! $instance_configured; then
   echo "To complete the restore process, please visit https://$hostname/setup/settings to review and save the appliance configuration."
 fi
+

debian/changelog

@@ -1,3 +1,15 @@
+github-backup-utils (2.21.0) UNRELEASED; urgency=medium
+
+  * Introduce option to skip restoring of audit logs #596
+  * Beta: Execute ghe-backup tasks in parallel #597
+  * Beta: Execute ghe-restore tasks in parallel #601
+  * Run repositories restore in parallel #603
+  * Fix mismatched `bm_start` and `bm_end` commands #607
+  * remove rsync restore method used by GHES versions prior to 2.13 #608
+  * Output MySQL backup strategy for clarity during backup and restore #610
+
+ -- Hao Jiang <[email protected]>  Tue, 09 Jun 2020 17:59:06 +0000
+
 github-backup-utils (2.19.5) UNRELEASED; urgency=medium
 
   * In legacy mode we should use ghe-import-mysql #581

share/github-backup-utils/version

@@ -1 +1 @@
-2.20.2
+2.21.0

test/testlib.sh

@@ -42,7 +42,7 @@ export GHE_BACKUP_CONFIG GHE_DATA_DIR GHE_REMOTE_DATA_DIR GHE_REMOTE_ROOT_DIR
 
 # The default remote appliance version. This may be set in the environment prior
 # to invoking tests to emulate a different remote vm version.
-: ${GHE_TEST_REMOTE_VERSION:=2.20.0}
+: ${GHE_TEST_REMOTE_VERSION:=2.21.0}
 export GHE_TEST_REMOTE_VERSION
 
 # Source in the backup config and set GHE_REMOTE_XXX variables based on the