[TravisCI] use newer versions of osx and flashplayer
This commit is contained in:
+2
-13
@@ -6,7 +6,6 @@ os:
|
||||
|
||||
sudo: false
|
||||
dist: trusty
|
||||
osx_image: xcode6.4
|
||||
|
||||
haxe:
|
||||
- "3.2.1"
|
||||
@@ -27,17 +26,8 @@ addons:
|
||||
- mono-devel
|
||||
- mono-mcs
|
||||
# Flash
|
||||
- libcurl3:i386
|
||||
- libglib2.0-0:i386
|
||||
- libx11-6:i386
|
||||
- libxext6:i386
|
||||
- libxt6:i386
|
||||
- libxcursor1:i386
|
||||
- libnss3:i386
|
||||
- libgtk2.0-0:i386
|
||||
# haxe development tmp fix
|
||||
- zlib1g
|
||||
- libpcre3
|
||||
- libglib2.0
|
||||
- libfreetype6
|
||||
|
||||
install:
|
||||
# os-specific config
|
||||
@@ -48,7 +38,6 @@ install:
|
||||
brew update;
|
||||
brew install mono;
|
||||
brew install python3;
|
||||
brew install pcre bdw-gc; haxelib setup ~/haxelib/;
|
||||
fi
|
||||
# Download and setup a standalone flash player debugger
|
||||
- haxe flash/install.hxml
|
||||
|
||||
+7
-4
@@ -7,11 +7,11 @@ class Install {
|
||||
// https://www.adobe.com/support/flashplayer/downloads.html
|
||||
static var fpDownload(default, never) = switch (systemName()) {
|
||||
case "Linux":
|
||||
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_sa_debug.i386.tar.gz";
|
||||
"http://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux_debug.x86_64.tar.gz";
|
||||
case "Mac":
|
||||
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/21/flashplayer_21_sa_debug.dmg";
|
||||
"http://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flashplayer_25_sa_debug.dmg";
|
||||
case "Windows":
|
||||
"http://fpdownload.macromedia.com/pub/flashplayer/updaters/21/flashplayer_21_sa_debug.exe";
|
||||
"http://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flashplayer_25_sa_debug.exe";
|
||||
case _:
|
||||
throw "unsupported system";
|
||||
}
|
||||
@@ -46,6 +46,9 @@ class Install {
|
||||
if (command("tar", ["-xf", Path.withoutDirectory(fpDownload), "-C", "flash"]) != 0)
|
||||
throw "failed to extract flash player";
|
||||
case "Mac":
|
||||
// https://github.com/caskroom/homebrew-cask/pull/15381
|
||||
if (command("brew", ["uninstall", "--force", "brew-cask"]) != 0)
|
||||
throw "failed to brew uninstall --force brew-cask";
|
||||
if (command("brew", ["tap", "caskroom/versions"]) != 0)
|
||||
throw "failed to brew tap caskroom/versions";
|
||||
if (command("brew", ["cask", "install", "flash-player-debugger"]) != 0)
|
||||
@@ -84,7 +87,7 @@ class Install {
|
||||
if (command("sudo", ["chmod", "a+rw", dir]) != 0)
|
||||
throw 'cannot set permission of $dir';
|
||||
case _:
|
||||
neko.Lib.rethrow(e);
|
||||
throw 'cannot create $dir: $e';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+4
-3
@@ -21,12 +21,13 @@ class Run {
|
||||
var exitCode = switch (systemName()) {
|
||||
case "Linux":
|
||||
// The flash player has some issues with unexplained crashes,
|
||||
// but if it runs about 8 times, it should succeed one of those...
|
||||
// but if it runs about 16 times, it should succeed one of those...
|
||||
var c = -1;
|
||||
for (i in 0...8) {
|
||||
if ((c = command("xvfb-run", ["flash/flashplayerdebugger", swf])) == 0)
|
||||
for (i in 0...16) {
|
||||
if ((c = command("xvfb-run", ["-a", "flash/flashplayerdebugger", swf])) == 0)
|
||||
break;
|
||||
println('retry... (${i+1})');
|
||||
sleep(1.5);
|
||||
}
|
||||
c;
|
||||
case "Mac":
|
||||
|
||||
Reference in New Issue
Block a user