]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
CI: travis-ci: speed up osx build by running brew scripted, switch to latest osx...
authorIlya Shipitsin <chipitsine@gmail.com>
Sat, 11 Jul 2020 16:51:37 +0000 (21:51 +0500)
committerWilly Tarreau <w@1wt.eu>
Wed, 15 Jul 2020 06:42:18 +0000 (08:42 +0200)
we used to use travis-ci brew plugin to install "socat", travis-ci brew
plugin works predictable in "all update" mode. sometimes it might take 12 minutes.

let us improve developer velocity by running brew from command line. It takes 2 minutes
instead of 12 minutes

latest osx seems to have more stable brew, let us switch to latest osx available.
osx images list: https://docs.travis-ci.com/user/reference/osx/#macos-version

.travis.yml

index 39b52ce2cc43bd31cfe530199b8c52bb6f8aacdf..cf227b3a5a255996815d84b4c1a1a158a96ae4b7 100644 (file)
@@ -22,9 +22,6 @@ addons:
   apt:
     update: true
     packages: [ liblua5.3-dev, libsystemd-dev, libpcre2-dev, clang-9, socat, ninja-build ]
-  homebrew:
-    update: true
-    packages: [ socat ]
 
 cache:
   directories:
@@ -94,8 +91,12 @@ matrix:
     compiler: clang
     env: TARGET=linux-glibc FLAGS= CC=clang-9
   - os: osx
+    osx_image: xcode12
     if: type == push
     compiler: clang
+    before_script:
+      - echo 'brew "socat"' > brew.bundle
+      - brew bundle --file=brew.bundle
     env: TARGET=osx FLAGS="USE_OPENSSL=1" OPENSSL_VERSION=1.1.1f
   - os: linux
     if: type == cron