Merge pull request #905 from psychocoderHPC/fix-tbb-win-download

backport of #901 to the release branch
alpaka-group · Jan 7, 2020 · ab0b8a4 · ab0b8a4
2 parents d7471b9 + 13c06f9
commit ab0b8a4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/script/travis/install_tbb.sh b/script/travis/install_tbb.sh
@@ -20,15 +20,17 @@ then
     travis_retry sudo apt-get -y --quiet --allow-unauthenticated --no-install-recommends install libtbb-dev
 elif [ "$TRAVIS_OS_NAME" = "osx" ]
 then
+    brew unlink python@2
     brew install tbb
 elif [ "$TRAVIS_OS_NAME" = "windows" ]
 then
     TBB_ARCHIVE_VER="tbb44_20160526oss"
-    TBB_DOWNLOAD_URL="https://www.threadingbuildingblocks.org/sites/default/files/software_releases/windows/${TBB_ARCHIVE_VER}_win_0.zip"
-    TBB_DST_PATH="${TBB_ROOT_DIR}/tbb.zip"
+    TBB_DOWNLOAD_URL="https://github.com/intel/tbb/releases/download/4.4.5/${TBB_ARCHIVE_VER}_win.zip"
+    TBB_DST_PATH="tbb.zip"
+    powershell.exe -Command '[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest "'${TBB_DOWNLOAD_URL}'" -OutFile "'${TBB_DST_PATH}'"'
     mkdir "${TBB_ROOT_DIR}"
-    powershell.exe Invoke-WebRequest "${TBB_DOWNLOAD_URL}" -OutFile "${TBB_DST_PATH}"
     unzip -q "${TBB_DST_PATH}" -d "${TBB_ROOT_DIR}"
+    rm "${TBB_DST_PATH}"
     TBB_UNZIP_DIR="${TBB_ROOT_DIR}/${TBB_ARCHIVE_VER}"
     mv ${TBB_UNZIP_DIR}/* "${TBB_ROOT_DIR}/"
     rmdir "${TBB_UNZIP_DIR}"