From 0bb4eb2d8ce3c92f386e24e5924fcd0b7f34a8ed Mon Sep 17 00:00:00 2001 From: jeefo Date: Mon, 12 Sep 2016 19:42:03 +0300 Subject: [PATCH 1/6] update clang version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8aab8d3..cac7aed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ compiler: - clang before_script: - sudo apt-get update -qq - - sudo apt-get install -y g++-multilib libc6-dev-i386 clang-3.4 llvm-dev + - sudo apt-get install -y g++-multilib libc6-dev-i386 clang-3.8 llvm-dev - sudo wget $OSX_CROSS_TOOL -O /tmp/osxcross.tgz - sudo mkdir -p /tmp/osxcross/target - sudo tar xzf /tmp/osxcross.tgz -C /tmp/osxcross/target/ From ce948ec1cbbc5d6c82b9de7e88cab2888ad9c10c Mon Sep 17 00:00:00 2001 From: jeefo Date: Mon, 12 Sep 2016 19:45:42 +0300 Subject: [PATCH 2/6] i mean, 3.7 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cac7aed..110ff37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ compiler: - clang before_script: - sudo apt-get update -qq - - sudo apt-get install -y g++-multilib libc6-dev-i386 clang-3.8 llvm-dev + - sudo apt-get install -y g++-multilib libc6-dev-i386 clang-3.7 llvm-dev - sudo wget $OSX_CROSS_TOOL -O /tmp/osxcross.tgz - sudo mkdir -p /tmp/osxcross/target - sudo tar xzf /tmp/osxcross.tgz -C /tmp/osxcross/target/ From 8a32ee9113c87cd19c440904da8abf848f60bfd7 Mon Sep 17 00:00:00 2001 From: jeefo Date: Mon, 12 Sep 2016 19:48:24 +0300 Subject: [PATCH 3/6] whatever --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 110ff37..8aab8d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ compiler: - clang before_script: - sudo apt-get update -qq - - sudo apt-get install -y g++-multilib libc6-dev-i386 clang-3.7 llvm-dev + - sudo apt-get install -y g++-multilib libc6-dev-i386 clang-3.4 llvm-dev - sudo wget $OSX_CROSS_TOOL -O /tmp/osxcross.tgz - sudo mkdir -p /tmp/osxcross/target - sudo tar xzf /tmp/osxcross.tgz -C /tmp/osxcross/target/ From 55dcddee54de2d1df9405c8898d176f1157e6792 Mon Sep 17 00:00:00 2001 From: jeefo Date: Mon, 12 Sep 2016 19:53:24 +0300 Subject: [PATCH 4/6] testing travis --- .travis.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8aab8d3..454b7e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,16 @@ +addons: + apt: + packages: + - clang-3.9 + - lib32stdc++6 + - lib32z1-dev + - libc6-dev-i386 + - linux-libc-dev + - gcc-multilib + - g++-multilib + sources: + - llvm-toolchain-precise-3.9 + - ubuntu-toolchain-r-test language: cpp branches: only: @@ -5,13 +18,9 @@ branches: compiler: - clang before_script: - - sudo apt-get update -qq - - sudo apt-get install -y g++-multilib libc6-dev-i386 clang-3.4 llvm-dev - - sudo wget $OSX_CROSS_TOOL -O /tmp/osxcross.tgz - - sudo mkdir -p /tmp/osxcross/target - - sudo tar xzf /tmp/osxcross.tgz -C /tmp/osxcross/target/ + - sudo wget $OSX_CROSS_TOOL -O /tmp/osxcross.tgz && mkdir -p /tmp/osxcross/target && tar xzf /tmp/osxcross.tgz -C /tmp/osxcross/target/ - export PATH=$PATH:/tmp/osxcross/target/bin - - wget https://yapb.jeefo.net/ci/scripts/gitrev.sh && chmod +x ./gitrev.sh && ./gitrev.sh + - wget https://yapb.jeefo.net/ci/scripts/gitrev.sh && chmod a+x ./gitrev.sh && ./gitrev.sh script: - cd project && make all after_success: From 82620773728801b14fb82b46f4d02a989ce1307b Mon Sep 17 00:00:00 2001 From: jeefo Date: Mon, 12 Sep 2016 19:56:03 +0300 Subject: [PATCH 5/6] testing travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 454b7e3..3f7f669 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ addons: apt: packages: - - clang-3.9 + - clang-3.7 - lib32stdc++6 - lib32z1-dev - libc6-dev-i386 @@ -9,7 +9,7 @@ addons: - gcc-multilib - g++-multilib sources: - - llvm-toolchain-precise-3.9 + - llvm-toolchain-precise-3.7 - ubuntu-toolchain-r-test language: cpp branches: From 4157fa3caff7a98bf797b729a8c8e203063c77e5 Mon Sep 17 00:00:00 2001 From: jeefo Date: Mon, 12 Sep 2016 20:03:43 +0300 Subject: [PATCH 6/6] testing travis --- project/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/makefile b/project/makefile index 114b821..aab230f 100644 --- a/project/makefile +++ b/project/makefile @@ -26,7 +26,7 @@ C_OPT_FLAGS = -O3 -DNDEBUG=1 -fno-exceptions -fno-rtti -funroll-loops -fomit-fr C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3 C_GCC4_FLAGS = -fvisibility=hidden CPP_GCC4_FLAGS = -fvisibility-inlines-hidden -CPP = clang +CPP = clang-3.7 CPP_OSX = clang LINK =