Skip to content

Commit

Permalink
patch google downloader to use recent version of gsutil
Browse files Browse the repository at this point in the history
  • Loading branch information
smac89 committed Jun 26, 2019
1 parent 07b1dd1 commit f4c639b
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 8 deletions.
8 changes: 2 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ matrix:
- docker build --rm --tag travis-build .
- |
docker run --volume "$PWD:$TRAVIS_BUILD_DIR" \
--volume /usr/local/share/ca-certificates:/usr/local/share/ca-certificates \
--volume /usr/share/ca-certificates:/usr/share/ca-certificates \
--volume /etc/ca-certificates:/etc/ca-certificates \
--volume /etc/ssl/certs:/etc/ssl/certs \
--workdir "$TRAVIS_BUILD_DIR" \
--env ARCH_DIST --env CC --env CXX --env TRAVIS_OS_NAME \
--name travis-build --detach --tty --interactive travis-build
Expand All @@ -68,8 +64,8 @@ before_script:
script:
- |
if [ $ARCH_DIST == 'linux32' ]; then
docker exec -e JCEF_DIR travis-build ./build.sh
docker container stop travis-build
docker exec -e JCEF_DIR travis-build ./build.sh && \
docker container stop travis-build && \
docker container rm travis-build
else
./build.sh
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM i386/alpine

ENV BASE_PACKAGES bash build-base git openssl ca-certificates
ENV BASE_PACKAGES bash build-base git ca-certificates
ENV BUILD_TOOLS openjdk8 python2 ninja cmake

# Update and Install tools
Expand Down
2 changes: 1 addition & 1 deletion apply-patches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@

cdir=$(pwd)
pushd $1
git apply --verbose "$cdir/patch/docs.patch"
git apply --verbose "$cdir/patch/*.patch"
popd
13 changes: 13 additions & 0 deletions patch/docs.patch → patch/build-tools.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
diff --git a/tools/buildtools/download_from_google_storage.py b/tools/buildtools/download_from_google_storage.py
index fb09c6d..a3a19d1 100644
--- a/tools/buildtools/download_from_google_storage.py
+++ b/tools/buildtools/download_from_google_storage.py
@@ -60,7 +60,7 @@ class Gsutil(object):
RETRY_BASE_DELAY = 5.0
RETRY_DELAY_MULTIPLE = 1.3

- def __init__(self, path, boto_path=None, timeout=None, version='4.15'):
+ def __init__(self, path, boto_path=None, timeout=None, version='4.39'):
if not os.path.exists(path):
raise FileNotFoundError('GSUtil not found in %s' % path)
self.path = path
diff --git a/tools/make_distrib.sh b/tools/make_distrib.sh
index abe30ed..005937b 100755
--- a/tools/make_distrib.sh
Expand Down

0 comments on commit f4c639b

Please sign in to comment.