From 0e0db0e38552a327eec0e33fe5fbca467e7692fc Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 4 Mar 2025 19:17:13 +0100 Subject: [PATCH] GHA: brew `--no-lock` an invalid option now, drop ``` Error: invalid option: --no-lock ``` Ref: https://github.com/curl/curl/actions/runs/13659344413/job/38186577572#step:2:655 Closes #16561 --- .github/workflows/macos.yml | 4 ++-- .github/workflows/non-native.yml | 2 +- .github/workflows/windows.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9dbe4ea718..6490e8065a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -187,7 +187,7 @@ jobs: pkgconf libpsl libssh2 \ ${{ !matrix.build.clang-tidy && 'libnghttp2 stunnel' || '' }} \ ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile - 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 + while [[ $? == 0 ]]; do for i in 1 2 3; do brew update && brew bundle install --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done - name: 'brew unlink openssl' if: ${{ contains(matrix.build.install, 'libressl') || contains(matrix.build.install, 'quictls') }} @@ -413,7 +413,7 @@ jobs: if: ${{ matrix.build == 'autotools' }} run: | echo automake libtool | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile - 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 + while [[ $? == 0 ]]; do for i in 1 2 3; do brew update && brew bundle install --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done - name: 'toolchain versions' run: | diff --git a/.github/workflows/non-native.yml b/.github/workflows/non-native.yml index eb64348256..1336ea8edc 100644 --- a/.github/workflows/non-native.yml +++ b/.github/workflows/non-native.yml @@ -286,7 +286,7 @@ jobs: if: ${{ matrix.build.configure }} run: | echo automake libtool | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile - 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 + while [[ $? == 0 ]]; do for i in 1 2 3; do brew update && brew bundle install --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done - name: 'toolchain versions' run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 36a3815212..e47acf7be8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -607,7 +607,7 @@ jobs: timeout-minutes: 5 run: | echo automake libtool | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile - 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 + while [[ $? == 0 ]]; do for i in 1 2 3; do brew update && brew bundle install --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done - name: 'cache compiler (mingw32ce)' uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4 -- 2.47.3