gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnurl] 276/411: CI/github: work-around for brew breakage on macOS


From: gnunet
Subject: [gnurl] 276/411: CI/github: work-around for brew breakage on macOS
Date: Wed, 13 Jan 2021 01:21:31 +0100

This is an automated email from the git hooks/post-receive script.

nikita pushed a commit to branch master
in repository gnurl.

commit 4cbb17a2cbbbe6337142d39479e21c3990b9c22f
Author: Daniel Stenberg <daniel@haxx.se>
AuthorDate: Mon Oct 26 13:10:29 2020 +0100

    CI/github: work-around for brew breakage on macOS
    
    ... and make it use OpenSSL 1.1 properly
    
    Fixes #6130
    Closes #6129
---
 .github/workflows/macos.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index e18721d71..b5e8e83ad 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  [...]
           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'
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]