Skip to content

Commit a08c7a4

Browse files
authored
Merge branch 'master' into zarenner/mssql-lsn-checks
2 parents 6c589b6 + 09b42a4 commit a08c7a4

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
- name: Install Dependencies (macOS)
2222
run: |
2323
brew install gnu-tar shellcheck jq pigz coreutils gnu-sed gnu-getopt
24-
brew unlink parallel
2524
brew install moreutils gawk
2625
if: matrix.os == 'macos-latest'
2726
- name: Get Sources

test/bin/systemctl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ghe-fake-true

test/test-ghe-restore-parallel.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
# ghe-restore command tests run in parallel
33
set -e
44

5+
# Currently disabled on macOS due to rsync issues
6+
if [[ "$OSTYPE" == "darwin"* ]]; then
7+
echo "Skipping $(basename "$0") tests as they are temporarily disabled on macOS: https://github.com/github/backup-utils/issues/841"
8+
exit 0
9+
fi
10+
511
export GHE_PARALLEL_ENABLED=yes
612

713
# use temp dir to fix rsync file issues in parallel execution:

0 commit comments

Comments
 (0)