From 0900b03ecf7cc8e085598f7b4e89817565427a4e Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Wed, 3 Jun 2020 19:58:14 +0200 Subject: CI/macos: fix 'is already installed' errors by using bundle Avoid failing CI builds due to nghttp2 being already installed. Closes #5513 --- .github/workflows/macos.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 666c49901..ebbdeca96 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -47,11 +47,14 @@ jobs: configure: --enable-debug --disable-shared --disable-threaded-resolver --enable-alt-svc tflags: -n -t --shallow=25 !FTP steps: - - uses: actions/checkout@v2 + - run: echo libtool autoconf automake pkg-config ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile + name: 'brew bundle' - - run: brew update && brew install libtool autoconf automake pkg-config ${{ matrix.build.install }} + - run: brew update && brew bundle install --no-lock --file /tmp/Brewfile name: 'brew install' + - uses: actions/checkout@v2 + - run: ./buildconf && ./configure ${{ matrix.build.configure }} name: 'configure' @@ -85,11 +88,14 @@ jobs: install: nghttp2 libressl generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/libressl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON steps: - - uses: actions/checkout@v2 + - run: echo libtool autoconf automake pkg-config ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile + name: 'brew bundle' - - run: brew update && brew install libtool autoconf automake pkg-config ${{ matrix.build.install }} + - run: brew update && brew bundle install --no-lock --file /tmp/Brewfile name: 'brew install' + - uses: actions/checkout@v2 + - run: cmake -H. -Bbuild ${{ matrix.build.generate }} name: 'cmake generate' -- cgit v1.2.3