From 87668d3e1e6df4a15a7d1983477885ad93ba2f08 Mon Sep 17 00:00:00 2001 From: Xuanda Yang Date: Tue, 7 Jul 2020 15:35:47 +0800 Subject: [PATCH 1/4] support llvm10 in macos buildbot --- .travis.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80ba2c37120a7..eaafb566f1b05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,14 +8,22 @@ matrix: osx_image: xcode10.3 env: - MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.6.1 && PYTHON=python" + - LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip && LLVM_FILE=taichi-llvm-8.0.1.zip" - os: osx osx_image: xcode10.3 env: - MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.7.1 && PYTHON=python" + - LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip && LLVM_FILE=taichi-llvm-8.0.1.zip" - os: osx osx_image: xcode10.3 env: - MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.8.1 && PYTHON=python" + - LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip && LLVM_FILE=taichi-llvm-8.0.1.zip" + - os: osx + osx_image: xcode10.3 + env: + - MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.8.1 && PYTHON=python" + - LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/taichi-dev/taichi_assets/releases/download/llvm10/taichi-llvm-10.0.0-macos.zip && LLVM_FILE=taichi-llvm-10.0.0-macos.zip" skip_commits: files: @@ -32,6 +40,7 @@ cache: before_install: - eval "${MATRIX_EVAL}" +- eval "${LLVM_EVAL}" - echo $CXX - echo $PYTHON - sysctl -n hw.ncpu @@ -39,8 +48,8 @@ before_install: - cd $TRAVIS_BUILD_DIR - mkdir taichi-llvm - cd taichi-llvm -- wget https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip --retry-on-http-error=403 --waitretry=3 --tries=5 -- unzip taichi-llvm-8.0.1.zip +- wget $LLVM_REMOTE_PATH --retry-on-http-error=403 --waitretry=3 --tries=5 +- unzip $LLVM_FILE - export PATH=$TRAVIS_BUILD_DIR/taichi-llvm/bin/:$PATH - ls $TRAVIS_BUILD_DIR/taichi-llvm/bin/ - echo $PATH From a135360bb69134229da733cc38efb62b14eeb578 Mon Sep 17 00:00:00 2001 From: Xuanda Yang Date: Tue, 7 Jul 2020 15:52:47 +0800 Subject: [PATCH 2/4] trigger ci From d5f21d066c2b525beafbf4fe1862e9eead23e67d Mon Sep 17 00:00:00 2001 From: Xuanda Yang Date: Tue, 7 Jul 2020 16:07:36 +0800 Subject: [PATCH 3/4] respond to code review --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index eaafb566f1b05..b2fe1114e9967 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,17 +8,17 @@ matrix: osx_image: xcode10.3 env: - MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.6.1 && PYTHON=python" - - LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip && LLVM_FILE=taichi-llvm-8.0.1.zip" + - LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip" - os: osx osx_image: xcode10.3 env: - MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.7.1 && PYTHON=python" - - LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip && LLVM_FILE=taichi-llvm-8.0.1.zip" + - LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip" - os: osx osx_image: xcode10.3 env: - MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.8.1 && PYTHON=python" - - LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip && LLVM_FILE=taichi-llvm-8.0.1.zip" + - LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip" - os: osx osx_image: xcode10.3 env: @@ -48,8 +48,8 @@ before_install: - cd $TRAVIS_BUILD_DIR - mkdir taichi-llvm - cd taichi-llvm -- wget $LLVM_REMOTE_PATH --retry-on-http-error=403 --waitretry=3 --tries=5 -- unzip $LLVM_FILE +- wget $LLVM_REMOTE_PATH --retry-on-http-error=403 --waitretry=3 --tries=5 -O llvm.zip +- unzip llvm.zip - export PATH=$TRAVIS_BUILD_DIR/taichi-llvm/bin/:$PATH - ls $TRAVIS_BUILD_DIR/taichi-llvm/bin/ - echo $PATH From 0585fd382f55a8f3faa1014a387d63f1cfc17b5d Mon Sep 17 00:00:00 2001 From: Xuanda Yang Date: Wed, 8 Jul 2020 11:27:51 +0800 Subject: [PATCH 4/4] build against llvm10 only --- .travis.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index b2fe1114e9967..0521376df073c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,22 +8,14 @@ matrix: osx_image: xcode10.3 env: - MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.6.1 && PYTHON=python" - - LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip" - os: osx osx_image: xcode10.3 env: - MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.7.1 && PYTHON=python" - - LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip" - os: osx osx_image: xcode10.3 env: - MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.8.1 && PYTHON=python" - - LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip" - - os: osx - osx_image: xcode10.3 - env: - - MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.8.1 && PYTHON=python" - - LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/taichi-dev/taichi_assets/releases/download/llvm10/taichi-llvm-10.0.0-macos.zip && LLVM_FILE=taichi-llvm-10.0.0-macos.zip" skip_commits: files: @@ -40,7 +32,6 @@ cache: before_install: - eval "${MATRIX_EVAL}" -- eval "${LLVM_EVAL}" - echo $CXX - echo $PYTHON - sysctl -n hw.ncpu @@ -48,7 +39,7 @@ before_install: - cd $TRAVIS_BUILD_DIR - mkdir taichi-llvm - cd taichi-llvm -- wget $LLVM_REMOTE_PATH --retry-on-http-error=403 --waitretry=3 --tries=5 -O llvm.zip +- wget https://github.com/taichi-dev/taichi_assets/releases/download/llvm10/taichi-llvm-10.0.0-macos.zip --retry-on-http-error=403 --waitretry=3 --tries=5 -O llvm.zip - unzip llvm.zip - export PATH=$TRAVIS_BUILD_DIR/taichi-llvm/bin/:$PATH - ls $TRAVIS_BUILD_DIR/taichi-llvm/bin/