summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-12-16 10:44:29 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-12-16 10:44:33 +0100
commit21405ce01c9afe5269109510f30da0bb011a1b65 (patch)
tree745dd113096fcf42a966e96937cf156aafc17b13
parent1451f4d2e18ec0ca55c1d3c4401a9c83d45c00f3 (diff)
downloadcurl-bagder/github-macos.tar.gz
Revert "CI/github: work-around for brew breakage on macOS"bagder/github-macos
This reverts commit 4cbb17a2cbbbe6337142d39479e21c3990b9c22f. ... as the work-around now causes failures.
-rw-r--r--.github/workflows/macos.yml18
1 files changed, 6 insertions, 12 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index b5e8e83ad..e18721d71 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -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
macosx-version-min: 10.15
- name: SecureTransport metalink
- install: nghttp2 openssl@1.1 libmetalink
+ install: nghttp2 openssl libmetalink
configure: --enable-debug --without-ssl --with-secure-transport --with-libmetalink
macosx-version-min: 10.8
- name: OpenSSL metalink
- install: nghttp2 openssl@1.1 libmetalink
- configure: --enable-debug --with-ssl=/usr/local/opt/openssl@1.1 --with-libmetalink
+ install: nghttp2 openssl libmetalink
+ configure: --enable-debug --with-ssl=/usr/local/opt/openssl --with-libmetalink
macosx-version-min: 10.9
- name: LibreSSL metalink
install: nghttp2 libressl libmetalink
configure: --enable-debug --with-ssl=/usr/local/opt/libressl --with-libmetalink
macosx-version-min: 10.9
- name: torture
- install: nghttp2 openssl@1.1
+ install: nghttp2 openssl
configure: --enable-debug --disable-shared --disable-threaded-resolver
tflags: -n -t --shallow=25 !FTP
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
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
name: 'brew install'
@@ -104,8 +101,8 @@ jobs:
CFLAGS: "-mmacosx-version-min=10.15 -Wno-error=undef -Wno-error=conversion"
build:
- name: OpenSSL
- install: nghttp2 openssl@1.1
- generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
+ install: nghttp2 openssl
+ generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
- name: LibreSSL
install: nghttp2 libressl
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
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
name: 'brew install'