Code review: 338560043: Work-around for macos TLS issues on Travis

Onager · Mar 8, 2018 · bc8d5bc · bc8d5bc
1 parent 010f9cb
commit bc8d5bc
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/config/dpkg/changelog b/config/dpkg/changelog
@@ -2,4 +2,4 @@ plaso (20180308-1) unstable; urgency=low
 
   * Auto-generated
 
- -- Log2Timeline <log2timeline-dev@googlegroups.com>  Thu, 08 Mar 2018 16:11:56 +0100
+ -- Log2Timeline <log2timeline-dev@googlegroups.com>  Thu, 08 Mar 2018 07:56:02 -0800
diff --git a/config/travis/install.sh b/config/travis/install.sh
@@ -12,25 +12,44 @@ PYTHON2_DEPENDENCIES="libbde-python libesedb-python libevt-python libevtx-python
 
 PYTHON2_TEST_DEPENDENCIES="python-mock python-tox";
 
+PYTHON3_DEPENDENCIES="libbde-python3 libesedb-python3 libevt-python3 libevtx-python3 libewf-python3 libfsntfs-python3 libfvde-python3 libfwnt-python3 libfwsi-python3 liblnk-python3 libmsiecf-python3 libolecf-python3 libqcow-python3 libregf-python3 libscca-python3 libsigscan-python3 libsmdev-python3 libsmraw-python3 libvhdi-python3 libvmdk-python3 libvshadow-python3 libvslvm-python3 python3-artifacts python3-bencode python3-binplist python3-certifi python3-chardet python3-construct python3-crypto python3-dateutil python3-dfdatetime python3-dfvfs python3-dfwinreg python3-dpkt python3-efilter python3-future python3-idna python3-pefile python3-psutil python3-pyparsing python3-pysqlite2 python3-pytsk3 python3-requests python3-six python3-tz python3-urllib3 python3-xlsxwriter python3-yaml python3-yara python3-zmq";
+
+PYTHON3_TEST_DEPENDENCIES="python3-mock python3-setuptools python3-tox";
+
 # Exit on error.
 set -e;
 
 if test ${TRAVIS_OS_NAME} = "osx";
 then
-	git clone https://github.com/log2timeline/l2tdevtools.git;
+	git clone https://github.com/log2timeline/l2tbinaries.git -b dev;
 
-	mv l2tdevtools ../;
-	mkdir dependencies;
+	mv l2tbinaries ../;
 
-	PYTHONPATH=../l2tdevtools ../l2tdevtools/tools/update.py --download-directory dependencies --track dev ${L2TBINARIES_DEPENDENCIES} ${L2TBINARIES_TEST_DEPENDENCIES};
+	for PACKAGE in ${L2TBINARIES_DEPENDENCIES};
+	do
+		sudo /usr/bin/hdiutil attach ../l2tbinaries/macos/${PACKAGE}-*.dmg;
+		sudo /usr/sbin/installer -target / -pkg /Volumes/${PACKAGE}-*.pkg/${PACKAGE}-*.pkg;
+		sudo /usr/bin/hdiutil detach /Volumes/${PACKAGE}-*.pkg
+	done
+
+	for PACKAGE in ${L2TBINARIES_TEST_DEPENDENCIES};
+	do
+		sudo /usr/bin/hdiutil attach ../l2tbinaries/macos/${PACKAGE}-*.dmg;
+		sudo /usr/sbin/installer -target / -pkg /Volumes/${PACKAGE}-*.pkg/${PACKAGE}-*.pkg;
+		sudo /usr/bin/hdiutil detach /Volumes/${PACKAGE}-*.pkg
+	done
 
 elif test ${TRAVIS_OS_NAME} = "linux";
 then
 	sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list;
 
 	sudo add-apt-repository ppa:gift/dev -y;
 	sudo apt-get update -q;
-	# Only install the Python 2 dependencies.
-	# Also see: https://docs.travis-ci.com/user/languages/python/#Travis-CI-Uses-Isolated-virtualenvs
-	sudo apt-get install -y ${COVERALLS_DEPENDENCIES} ${PYTHON2_DEPENDENCIES} ${PYTHON2_TEST_DEPENDENCIES};
+
+	if test ${TRAVIS_PYTHON_VERSION} = "2.7";
+	then
+		sudo apt-get install -y ${COVERALLS_DEPENDENCIES} ${PYTHON2_DEPENDENCIES} ${PYTHON2_TEST_DEPENDENCIES};
+	else
+		sudo apt-get install -y ${PYTHON3_DEPENDENCIES} ${PYTHON3_TEST_DEPENDENCIES};
+	fi
 fi