travis

2 files changed, 14 insertions, 11 deletions

diff --git a/.travis.yml b/.travis.yml
index 1ebae5c..08e5b2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,14 +25,14 @@ matrix:
       language: cpp
       before_script: 
       - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-      - sudo add-apt-repository ppa:fkrull/deadsnakes -y
+        #- sudo add-apt-repository ppa:fkrull/deadsnakes -y
       - sudo apt-get update -y
       - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add -
       - echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main" | sudo tee -a /etc/apt/sources.list
       - sudo apt-get update -qq
       - travis_retry sudo apt-get install clang-6.0 libclang-6.0-dev libclang-common-6.0-dev libllvm6.0 llvm-6.0-dev llvm-6.0 llvm-6.0-runtime -y
-      - sudo apt-get install gcc-4.9 g++-4.9
-      - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
+        #- sudo apt-get install gcc-4.9 g++-4.9
+        #- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
       - git submodule init
       - git submodule update
       script: 
@@ -44,14 +44,17 @@ matrix:
       language: cpp
       before_script: 
       - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-      - sudo add-apt-repository ppa:fkrull/deadsnakes -y
+        #- sudo add-apt-repository ppa:fkrull/deadsnakes -y
       - sudo apt-get update -y
-      - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add -
-      - echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-xenial-9.0 main" | sudo tee -a /etc/apt/sources.list
-      - sudo apt-get update -qq
-      - travis_retry sudo apt-get install clang-9.0 libclang-9.0-dev libclang-common-9.0-dev libllvm9.0 llvm-9.0-dev llvm-9.0 llvm-9.0-runtime -y
-      - sudo apt-get install gcc-4.9 g++-4.9
-      - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
+        #- wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add -
+        #- echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9.0 main" | sudo tee -a /etc/apt/sources.list
+        #- sudo apt-get update -qq
+        #- travis_retry sudo apt-get install clang-9.0 libclang-9.0-dev libclang-common-9.0-dev libllvm9.0 llvm-9.0-dev llvm-9.0 llvm-9.0-runtime -y
+        #- sudo apt-get install gcc-4.9 g++-4.9
+        #- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
+        wget https://apt.llvm.org/llvm.sh
+        chmod +x llvm.sh
+        sudo ./llvm.sh 9
       - git submodule init
       - git submodule update
       script: 
diff --git a/run.sh b/run.sh
index 26a1972..c0acf21 100755
--- a/run.sh
+++ b/run.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/sh
 
-"cgrep" -A 1 -B 1 --func --var --regex n[aA]m ./cgrep.cpp
+"./cgrep" -A 1 -B 1 --func --var --regex n[aA]m ./cgrep.cpp