Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 51dcf9c

Browse filesBrowse files
committed
need to source multibuild to get past tests
1 parent 9fe282b commit 51dcf9c
Copy full SHA for 51dcf9c

File tree

Expand file treeCollapse file tree

1 file changed

+12
-11
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+12
-11
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+12-11Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -647,21 +647,22 @@ jobs:
647647
before_install: |
648648
set -e
649649
650-
if [[ $SDIST == 0 ]]; then
651-
# Check out and prepare the source
652-
# Multibuild doesn't have releases, so --depth would break eventually (see
653-
# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
654-
git submodule update --init multibuild
650+
# Check out and prepare the source
651+
# Multibuild doesn't have releases, so --depth would break eventually (see
652+
# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
653+
git submodule update --init multibuild
654+
655+
source multibuild/common_utils.sh
655656
656-
source multibuild/common_utils.sh
657+
# https://github.com/matthew-brett/multibuild/issues/116
658+
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
657659
658-
# https://github.com/matthew-brett/multibuild/issues/116
659-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
660+
source multibuild/travis_steps.sh
661+
# This sets -x
662+
source travis_multibuild_customize.sh
660663
661-
source multibuild/travis_steps.sh
662-
# This sets -x
664+
if [[ $SDIST == 0 ]]; then
663665
664-
source travis_multibuild_customize.sh
665666
echo $ENABLE_CONTRIB > contrib.enabled
666667
echo $ENABLE_HEADLESS > headless.enabled
667668

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.