2
0
Эх сурвалжийг харах

Merge pull request #2433 from andyli/travis

TravisCI: run apt-get update before installing anything via apt-get.
Simon Krajewski 11 жил өмнө
parent
commit
f43123ac76

+ 1 - 0
.travis.yml

@@ -20,6 +20,7 @@ matrix:
     - env: TARGET=cs
     - env: TARGET=cs
 
 
 before_install:
 before_install:
+  - sudo apt-get update
   - sudo apt-get install ocaml zlib1g-dev libgc-dev -y
   - sudo apt-get install ocaml zlib1g-dev libgc-dev -y
   - git clone https://github.com/HaxeFoundation/neko.git ~/neko && cd ~/neko && make && sudo make install && cd $TRAVIS_BUILD_DIR
   - git clone https://github.com/HaxeFoundation/neko.git ~/neko && cd ~/neko && make && sudo make install && cd $TRAVIS_BUILD_DIR
 
 

+ 1 - 1
tests/unit/RunTravis.hx

@@ -15,7 +15,7 @@ class RunTravis {
 		Sys.putEnv("DISPLAY", ":99.0");
 		Sys.putEnv("DISPLAY", ":99.0");
 		runCommand("sh", ["-e", "/etc/init.d/xvfb", "start"]);
 		runCommand("sh", ["-e", "/etc/init.d/xvfb", "start"]);
 		Sys.putEnv("AUDIODEV", "null");
 		Sys.putEnv("AUDIODEV", "null");
-		runCommand("sudo", ["apt-get", "install", "-qq", "libgd2-xpm", "ia32-libs", "ia32-libs-multiarch", "flashplugin-installer", "-y"]);
+		runCommand("sudo", ["apt-get", "install", "-qq", "libgd2-xpm", "ia32-libs", "ia32-libs-multiarch", "-y"]);
 		runCommand("wget", ["-nv", "http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_sa_debug.i386.tar.gz"]);
 		runCommand("wget", ["-nv", "http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_sa_debug.i386.tar.gz"]);
 		runCommand("tar", ["-xf", "flashplayer_11_sa_debug.i386.tar.gz"]);
 		runCommand("tar", ["-xf", "flashplayer_11_sa_debug.i386.tar.gz"]);
 		File.saveContent(Sys.getEnv("HOME") + "/mm.cfg", "ErrorReportingEnable=1\nTraceOutputFileEnable=1");
 		File.saveContent(Sys.getEnv("HOME") + "/mm.cfg", "ErrorReportingEnable=1\nTraceOutputFileEnable=1");