CI: fix retrying on brew failures

The previous attempt didn't consider that the shell would exit
immediately after the false statement in the retry case.

Follow-up to dc141a37
This commit is contained in:
Dan Fandrich 2023-03-10 16:41:25 -08:00
Родитель 544a7f804d
Коммит c2b7249db2
2 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -210,7 +210,7 @@ macos_task:
pkginstall_script:
- echo libtool autoconf automake pkg-config ${install_packages} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
- "for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break || { echo Error: wait to try again; sleep 10; false; } done"
- "while [[ $? == 0 ]]; do for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done"
- sudo -H python3 -m pip install --upgrade pip
- sudo -H python3 -m pip install impacket
configure_script:

4
.github/workflows/macos.yml поставляемый
Просмотреть файл

@ -96,7 +96,7 @@ jobs:
# Run this command with retries because of spurious failures seen
# while running the tests, for example
# https://github.com/curl/curl/runs/4095721123?check_suite_focus=true
- run: "for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break || { echo Error: wait to try again; sleep 10; false; } done"
- run: "while [[ $? == 0 ]]; do for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; false; } done; false Too many retries; done"
name: 'brew install'
- run: python3 -m pip install impacket
@ -155,7 +155,7 @@ jobs:
- run: echo libtool autoconf automake pkg-config ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
name: 'brew bundle'
- run: "for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break || { echo Error: wait to try again; sleep 10; false; } done"
- run: "while [[ $? == 0 ]]; do for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; false; } done; false Too many retries; done"
name: 'brew install'
- run: python3 -m pip install impacket