From f23d163a277f8546953c2f5c3e334d2e09ec21f6 Mon Sep 17 00:00:00 2001 From: oldmud0 <3421260-oldmud0@users.noreply.gitlab.com> Date: Sun, 10 Feb 2019 01:52:16 +0000 Subject: [PATCH] Okay, let's try this again... --- .travis.yml | 4 ++-- scripts/macos_build.sh | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 855b57d..e1fcb36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,5 @@ before_install: script: # XXX: please chmod +x the shell script. - - sh ./scripts/macos_build.sh - - ./scripts/macos_post_build.sh + - bash ./scripts/macos_build.sh + - bash ./scripts/macos_post_build.sh diff --git a/scripts/macos_build.sh b/scripts/macos_build.sh index 150c338..86605c5 100644 --- a/scripts/macos_build.sh +++ b/scripts/macos_build.sh @@ -1,9 +1,8 @@ #!/bin/sh -set -Eeuxo pipefail +set -Eexo pipefail -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/openssl/lib/pkgconfig +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/local/opt/openssl/lib/pkgconfig export PATH=$PATH:/usr/local/opt/qt5/bin:/usr/local/bin mkdir bass