]> git.proxmox.com Git - swtpm.git/commitdiff
Travis: Work around failing OsX builds due to brew error
authorStefan Berger <stefanb@linux.vnet.ibm.com>
Thu, 24 Oct 2019 20:27:29 +0000 (16:27 -0400)
committerStefan Berger <stefanb@us.ibm.com>
Fri, 25 Oct 2019 14:54:54 +0000 (10:54 -0400)
The Travis build on OSX was failing due to the following error:

/usr/local/Homebrew/Library/Homebrew/brew.rb:23:in `require_relative': \
   /usr/local/Homebrew/Library/Homebrew/global.rb:110: \
   syntax error, unexpected keyword_rescue, expecting keyword_end (SyntaxError)

from /usr/local/Homebrew/Library/Homebrew/brew.rb:23:in `<main>'

The command "brew tap discoteq/discoteq" failed and exited with 1 during .

This patch resolves the issue.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
.travis.yml

index 97221eba095964e9cf4c95456dec0b57b650ac61..f7a11a099a1e50d6aeead8a7773e5028bcc42ae2 100644 (file)
@@ -121,14 +121,14 @@ matrix:
       os: osx
       compiler: clang
       before_script:
-      - brew upgrade gnutls
-      - brew install expect
-      - brew install libtasn
-      - brew install glib
-      - brew install gawk
-      - brew install gmp
-      - brew tap discoteq/discoteq
-      - brew install flock
-      - brew install socat
+      - HOMEBREW_NO_AUTO_UPDATE=1 brew upgrade gnutls || true
+      - HOMEBREW_NO_AUTO_UPDATE=1 brew install expect
+      - HOMEBREW_NO_AUTO_UPDATE=1 brew install libtasn
+      - HOMEBREW_NO_AUTO_UPDATE=1 brew install glib
+      - HOMEBREW_NO_AUTO_UPDATE=1 brew install gawk
+      - HOMEBREW_NO_AUTO_UPDATE=1 brew install gmp
+      - HOMEBREW_NO_AUTO_UPDATE=1 brew tap discoteq/discoteq
+      - HOMEBREW_NO_AUTO_UPDATE=1 brew install flock
+      - HOMEBREW_NO_AUTO_UPDATE=1 brew install socat
       # To run the pkcs11 test with softhsm we need SUDO (above)
-      - brew install softhsm
+      - HOMEBREW_NO_AUTO_UPDATE=1 brew install softhsm