From 09c0ef8e83cea1d18130069237a38d5a883e41bc Mon Sep 17 00:00:00 2001 From: Eric Timmons <etimmons@mit.edu> Date: Mon, 2 Nov 2020 23:50:54 -0500 Subject: [PATCH] Fix retry option parsing --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c26718c..0288980 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ stages: echo "Pulling $parent" docker pull --platform=$DOCKER_PLATFORM "$parent" done - - retry -t 3 -d 60 bashbrew build $CI_PROJECT_NAME + - retry -t 3 -d 60 -- bashbrew build $CI_PROJECT_NAME - docker images - bashbrew tag --target-namespace=$CANONICAL_NAMESPACE$ARCH $CI_PROJECT_NAME cache: @@ -109,7 +109,7 @@ Bashbrew build - arm32v7: echo "GitFetch: refs/heads/$CI_COMMIT_REF_NAME" >> "$CI_PROJECT_NAME" - cat "$CI_PROJECT_NAME.tmp" >> "$CI_PROJECT_NAME" - rm "$CI_PROJECT_NAME.tmp" - - retry -t 3 -d 60 bashbrew --namespace=$CANONICAL_NAMESPACE$ARCH push $CI_PROJECT_NAME + - retry -t 3 -d 60 -- bashbrew --namespace=$CANONICAL_NAMESPACE$ARCH push $CI_PROJECT_NAME cache: paths: - cache @@ -168,6 +168,6 @@ Bashbrew put-shared: echo "GitFetch: refs/heads/$CI_COMMIT_REF_NAME" >> "$CI_PROJECT_NAME" - cat "$CI_PROJECT_NAME.tmp" >> "$CI_PROJECT_NAME" - rm "$CI_PROJECT_NAME.tmp" - - bashbrew --arch-namespace amd64=${CANONICAL_NAMESPACE}amd64 --arch-namespace arm32v7=${CANONICAL_NAMESPACE}arm32v7 --arch-namespace arm64v8=${CANONICAL_NAMESPACE}arm64v8 --arch-namespace windows-amd64=${CANONICAL_NAMESPACE}winamd64 put-shared "$CI_PROJECT_NAME" + - retry -t 3 -d 60 -- bashbrew --arch-namespace amd64=${CANONICAL_NAMESPACE}amd64 --arch-namespace arm32v7=${CANONICAL_NAMESPACE}arm32v7 --arch-namespace arm64v8=${CANONICAL_NAMESPACE}arm64v8 --arch-namespace windows-amd64=${CANONICAL_NAMESPACE}winamd64 put-shared "$CI_PROJECT_NAME" tags: - bashbrew-amd64 -- GitLab