From 007890ebfdf0fc3d1bce8529ab1fb538e5f6b2d9 Mon Sep 17 00:00:00 2001 From: Jarek Kowalski Date: Sat, 29 Feb 2020 10:46:42 -0800 Subject: [PATCH] travis: used own retry script, since travis_retry does not work in makefile --- Makefile | 8 ++++---- tools/retry.sh | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100755 tools/retry.sh diff --git a/Makefile b/Makefile index d47d5cec1..a062d7b84 100644 --- a/Makefile +++ b/Makefile @@ -6,10 +6,10 @@ KOPIA_INTEGRATION_EXE=$(CURDIR)/dist/integration/kopia.exe all: test lint vet integration-tests -maybe_travis_retry= +retry= ifneq ($(TRAVIS_OS_NAME),) -maybe_travis_retry=travis_retry +retry=$(CURDIR)/tools/retry.sh endif include tools/tools.mk @@ -73,9 +73,9 @@ kopia-ui: goreleaser $(MAKE) -C app build-electron travis-release: - $(maybe_travis_retry) $(MAKE) goreleaser kopia-ui + $(retry) $(MAKE) goreleaser kopia-ui $(MAKE) lint vet test-with-coverage html-ui-tests - $(maybe_travis_retry) $(MAKE) integration-tests + $(retry) $(MAKE) integration-tests ifeq ($(TRAVIS_OS_NAME),linux) $(MAKE) website $(MAKE) stress-test diff --git a/tools/retry.sh b/tools/retry.sh new file mode 100755 index 000000000..bbac96dd4 --- /dev/null +++ b/tools/retry.sh @@ -0,0 +1,7 @@ +for attempt in 1 2 3; do + echo "+ $@ (attempt $attempt)" + if "$@"; then + exit 0 + fi +done +exit 1