mirror of
https://github.com/moparisthebest/curl
synced 2025-02-28 17:31:46 -05:00
CI/macos: fix 'is already installed' errors by using bundle
Avoid failing CI builds due to nghttp2 being already installed. Closes #5513
This commit is contained in:
parent
74368dc6ae
commit
0900b03ecf
14
.github/workflows/macos.yml
vendored
14
.github/workflows/macos.yml
vendored
@ -47,11 +47,14 @@ jobs:
|
|||||||
configure: --enable-debug --disable-shared --disable-threaded-resolver --enable-alt-svc
|
configure: --enable-debug --disable-shared --disable-threaded-resolver --enable-alt-svc
|
||||||
tflags: -n -t --shallow=25 !FTP
|
tflags: -n -t --shallow=25 !FTP
|
||||||
steps:
|
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'
|
name: 'brew install'
|
||||||
|
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
- run: ./buildconf && ./configure ${{ matrix.build.configure }}
|
- run: ./buildconf && ./configure ${{ matrix.build.configure }}
|
||||||
name: 'configure'
|
name: 'configure'
|
||||||
|
|
||||||
@ -85,11 +88,14 @@ jobs:
|
|||||||
install: nghttp2 libressl
|
install: nghttp2 libressl
|
||||||
generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/libressl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
|
generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/libressl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
|
||||||
steps:
|
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'
|
name: 'brew install'
|
||||||
|
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
- run: cmake -H. -Bbuild ${{ matrix.build.generate }}
|
- run: cmake -H. -Bbuild ${{ matrix.build.generate }}
|
||||||
name: 'cmake generate'
|
name: 'cmake generate'
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user