Skip to content

Commit 00d57b4

Browse files
luke-jrlaanwj
authored andcommitted
Workaround Travis-side CI issues
Github-Pull: bitcoin#7487 Rebased-From: 149641e c01f08d 5d1148c 1ecbb3b
1 parent 35af157 commit 00d57b4

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
# compiler key (which we don't use anyway). This is worked around for now by
44
# replacing the "compilers" with a build name prefixed by the no-op ":"
55
# command. See: https://github.com/travis-ci/travis-ci/issues/4393
6+
# - sudo/dist/group are set so as to get Blue Box VMs, necessary for [loopback]
7+
# IPv6 support
8+
9+
sudo: required
10+
dist: precise
11+
group: legacy
612

713
os: linux
814
language: cpp
@@ -52,7 +58,7 @@ install:
5258
before_script:
5359
- unset CC; unset CXX
5460
- mkdir -p depends/SDKs depends/sdk-sources
55-
- if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then wget $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -O depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
61+
- if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
5662
- if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
5763
- make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
5864
script:

depends/builders/darwin.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ build_darwin_OTOOL: = $(shell xcrun -f otool)
77
build_darwin_NM: = $(shell xcrun -f nm)
88
build_darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool)
99
build_darwin_SHA256SUM = shasum -a 256
10-
build_darwin_DOWNLOAD = curl --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -L -o
10+
build_darwin_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -L -o
1111

1212
#darwin host on darwin builder. overrides darwin host preferences.
1313
darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION)

depends/builders/linux.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
build_linux_SHA256SUM = sha256sum
2-
build_linux_DOWNLOAD = wget --timeout=$(DOWNLOAD_CONNECT_TIMEOUT) --tries=$(DOWNLOAD_RETRIES) -nv -O
2+
build_linux_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -L -o

0 commit comments

Comments
 (0)