From b82f5a90117310f64f862fd720edc0315482abb6 Mon Sep 17 00:00:00 2001
From: Blaise Tine <tinebp@iam-ssh1.research.intel-research.net>
Date: Tue, 1 Sep 2020 10:45:44 -0700
Subject: [PATCH] fix ci bui;d

---
 .travis.yml             | 12 ++++++------
 ci/toolchain_install.sh | 20 ++++++++++++++++++++
 hw/opae/README          |  3 ++-
 3 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100755 ci/toolchain_install.sh

diff --git a/.travis.yml b/.travis.yml
index 03f149ec..69172fa7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: cpp
-dist: focal
+dist: bionic
 os: linux
 compiler: gcc
 addons:
@@ -11,13 +11,13 @@ addons:
         - valgrind
         - verilator
         - yosys
-        
+
 install:
-  # RISCV_TOOLCHAIN
+  # TOOLCHAIN
+  - ci/toolchain_install.sh
   - export RISCV_TOOLCHAIN_PATH=$PWD/riscv-gnu-toolchain
-  - wget https://github.com/stnolting/riscv_gcc_prebuilt/raw/master/data/$TOOLCHAIN_V.tar.gz
-  - mkdir $RISCV_TOOLCHAIN_PATH
-  - tar -xzf $TOOLCHAIN_V.tar.gz -C $RISCV_TOOLCHAIN_PATH
+  - export VERILATOR_ROOT=$PWD/verilator
+  - export PATH=$VERILATOR_ROOT/bin:$PATH
     
   # VORTEX
   - git clone --recursive https://github.com/vortexgpgpu/vortex.git
diff --git a/ci/toolchain_install.sh b/ci/toolchain_install.sh
new file mode 100755
index 00000000..c081f451
--- /dev/null
+++ b/ci/toolchain_install.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+REPOSITORY=https://github.com/vortexgpgpu/vortex-toolchain-prebuilt/raw/master
+
+# RISCV-GNU_TOOLCHAIN
+
+for x in {a..o} 
+do
+    wget $REPOSITORY/riscv-gnu-toolchain/ubuntu/bionic/riscv-gnu-toolchain.tar.bz2.parta$x
+done
+
+cat riscv-gnu-toolchain.tar.bz2.parta* > riscv-gnu-toolchain.tar.bz2
+tar -xvf riscv-gnu-toolchain.tar.bz2
+rm -f riscv-gnu-toolchain.tar.bz2*
+
+# VERILATOR
+
+wget $REPOSITORY/verilator/ubuntu/bionic/verilator.bz2
+tar -xvf verilator.bz2
+rm -f verilator.bz2
\ No newline at end of file
diff --git a/hw/opae/README b/hw/opae/README
index f4f0d3ce..1cd7b8ef 100644
--- a/hw/opae/README
+++ b/hw/opae/README
@@ -78,7 +78,8 @@ tar -zcvf vortex.vcd.tar.gz ./build_ase_1c/work/vortex.vcd
 tar -zcvf trace.vcd.tar.gz obj_dir/trace.vcd
 tar -zcvf trace.vcd.tar.gz trace.vcd
 tar -zcvf run.log.tar.gz run.log
-tar -cjvf run.log.tar.bz2 run.log
+tar -cvjf run.log.tar.bz2 run.log
+
 
 # decompress VCD trace
 tar -zxvf /mnt/c/Users/Blaise/Downloads/vortex.vcd.tar.gz