aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christopher Baklid <[email protected]>2018-05-31 12:35:53 +0200
committerGravatar Christopher Baklid <[email protected]>2018-05-31 12:35:53 +0200
commit8c82f85d767136710d148761fa9dc5c3f1fb6439 (patch)
tree9aed2ed0bf442248280413d10ed61e936f0e550c
parentfigure out why protobuf is missing after install (diff)
follow travis preinstall conventions
-rw-r--r--.travis.yml4
-rw-r--r--scripts/ci.sh3
2 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 5f58b10..f5c7e4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,10 @@ sudo: required
#services:
# - docker
+before_install:
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq -y libprotobuf-dev libstdc++6
+
env:
global:
- PIPENV_VENV_IN_PROJECT=1
diff --git a/scripts/ci.sh b/scripts/ci.sh
index 13911da..a49a64e 100644
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -1,9 +1,6 @@
#!/bin/bash
echo $path
chmod +x binaries/nsjail2.6-ubuntu-x86_64
-sudo apt-get -qq update
-sudo apt-get install -y libprotobuf-dev
-sudo apt-get install -y libstdc++6
sudo updatedb
sudo locate libprotobuf
echo $(pwd)/binaries/nsjail2.6-ubuntu-x86_64 -Mo --rlimit_as 700 --chroot / -E LANG=en_US.UTF-8 -R/usr -R/lib -R/lib64 --user nobody --group nogroup --time_limit 2 --disable_proc --iface_no_lo --quiet -- /usr/bin/python3.6 -ISq -c 'print("test")'