]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
CI/github: work-around for brew breakage on macOS
authorDaniel Stenberg <daniel@haxx.se>
Mon, 26 Oct 2020 12:10:29 +0000 (13:10 +0100)
committerDaniel Stenberg <daniel@haxx.se>
Mon, 26 Oct 2020 21:14:53 +0000 (22:14 +0100)
... and make it use OpenSSL 1.1 properly

Fixes #6130
Closes #6129

.github/workflows/macos.yml

index e18721d71fdb6438c9e48c0d9c73d73e9192c451..b5e8e83ad9592810b37b4aabf40e76b4d91c0fd7 100644 (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
           macosx-version-min: 10.15
         - name: SecureTransport metalink
-          install: nghttp2 openssl libmetalink
+          install: nghttp2 openssl@1.1 libmetalink
           configure: --enable-debug --without-ssl --with-secure-transport --with-libmetalink
           macosx-version-min: 10.8
         - name: OpenSSL metalink
-          install: nghttp2 openssl libmetalink
-          configure: --enable-debug --with-ssl=/usr/local/opt/openssl --with-libmetalink
+          install: nghttp2 openssl@1.1 libmetalink
+          configure: --enable-debug --with-ssl=/usr/local/opt/openssl@1.1 --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
+          install: nghttp2 openssl@1.1
           configure: --enable-debug --disable-shared --disable-threaded-resolver
           tflags: -n -t --shallow=25 !FTP
           macosx-version-min: 10.9
@@ -63,6 +63,9 @@ 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'
 
@@ -101,8 +104,8 @@ jobs:
           CFLAGS: "-mmacosx-version-min=10.15 -Wno-error=undef -Wno-error=conversion"
         build:
         - name: OpenSSL
-          install: nghttp2 openssl
-          generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
+          install: nghttp2 openssl@1.1
+          generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 -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
@@ -110,6 +113,9 @@ 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'