moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-16 06:25:03 -05:00
Code Issues Releases Wiki Activity

Revert "CI/github: work-around for brew breakage on macOS"

Browse Source 
This reverts commit 4cbb17a2cb.

... as the work-around now causes failures.

Closes #6332
This commit is contained in:
Daniel Stenberg 2020-12-16 10:44:29 +01:00
parent 1451f4d2e1
commit d16fb4d056
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/macos.yml vendored
View File

@ -39,19 +39,19 @@ jobs:
configure: --enable-debug --enable-maintainer-mode --disable-dict --disable-file --disable-ftp --disable-gopher --disable-imap --disable-ldap --disable-pop3 --disable-rtmp --disable-rtsp --disable-scp --disable-sftp --disable-smb --disable-smtp --disable-telnet --disable-tftp --disable-unix-sockets --disable-shared --without-brotli --without-gssapi --without-libidn2 --without-libmetalink --without-libpsl --without-librtmp --without-libssh2 --without-nghttp2 --without-ntlm-auth --without-ssl --without-zlib configure: --enable-debug --enable-maintainer-mode --disable-dict --disable-file --disable-ftp --disable-gopher --disable-imap --disable-ldap --disable-pop3 --disable-rtmp --disable-rtsp --disable-scp --disable-sftp --disable-smb --disable-smtp --disable-telnet --disable-tftp --disable-unix-sockets --disable-shared --without-brotli --without-gssapi --without-libidn2 --without-libmetalink --without-libpsl --without-librtmp --without-libssh2 --without-nghttp2 --without-ntlm-auth --without-ssl --without-zlib
macosx-version-min: 10.15 macosx-version-min: 10.15
- name: SecureTransport metalink - name: SecureTransport metalink
install: nghttp2 openssl@1.1 libmetalink install: nghttp2 openssl libmetalink
configure: --enable-debug --without-ssl --with-secure-transport --with-libmetalink configure: --enable-debug --without-ssl --with-secure-transport --with-libmetalink
macosx-version-min: 10.8 macosx-version-min: 10.8
- name: OpenSSL metalink - name: OpenSSL metalink
install: nghttp2 openssl@1.1 libmetalink install: nghttp2 openssl libmetalink
configure: --enable-debug --with-ssl=/usr/local/opt/openssl@1.1 --with-libmetalink configure: --enable-debug --with-ssl=/usr/local/opt/openssl --with-libmetalink
macosx-version-min: 10.9 macosx-version-min: 10.9
- name: LibreSSL metalink - name: LibreSSL metalink
install: nghttp2 libressl libmetalink install: nghttp2 libressl libmetalink
configure: --enable-debug --with-ssl=/usr/local/opt/libressl --with-libmetalink configure: --enable-debug --with-ssl=/usr/local/opt/libressl --with-libmetalink
macosx-version-min: 10.9 macosx-version-min: 10.9
- name: torture - name: torture
install: nghttp2 openssl@1.1 install: nghttp2 openssl
configure: --enable-debug --disable-shared --disable-threaded-resolver configure: --enable-debug --disable-shared --disable-threaded-resolver
tflags: -n -t --shallow=25 !FTP tflags: -n -t --shallow=25 !FTP
macosx-version-min: 10.9 macosx-version-min: 10.9
@ -63,9 +63,6 @@ jobs:
- run: echo libtool autoconf automake pkg-config ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile - run: echo libtool autoconf automake pkg-config ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
name: 'brew bundle' name: 'brew bundle'
- run: brew uninstall openssl@1.0.2t && brew uninstall python@2.7.17 && brew untap local/openssl && brew untap local/python2 && brew install openssl@1.1
name: 'brew workaround'
- run: brew update && brew bundle install --no-lock --file /tmp/Brewfile - run: brew update && brew bundle install --no-lock --file /tmp/Brewfile
name: 'brew install' name: 'brew install'
@ -104,8 +101,8 @@ jobs:
CFLAGS: "-mmacosx-version-min=10.15 -Wno-error=undef -Wno-error=conversion" CFLAGS: "-mmacosx-version-min=10.15 -Wno-error=undef -Wno-error=conversion"
build: build:
- name: OpenSSL - name: OpenSSL
install: nghttp2 openssl@1.1 install: nghttp2 openssl
generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
- name: LibreSSL - name: LibreSSL
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
@ -113,9 +110,6 @@ jobs:
- run: echo libtool autoconf automake pkg-config ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile - run: echo libtool autoconf automake pkg-config ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
name: 'brew bundle' name: 'brew bundle'
- run: brew uninstall openssl@1.0.2t && brew uninstall python@2.7.17 && brew untap local/openssl && brew untap local/python2
name: 'brew workaround'
- run: brew update && brew bundle install --no-lock --file /tmp/Brewfile - run: brew update && brew bundle install --no-lock --file /tmp/Brewfile
name: 'brew install' name: 'brew install'