Selaa lähdekoodia

[TravisCI] use Brewfile to install hl dependencies

Andy Li 7 vuotta sitten
vanhempi
commit
97d6842d55
2 muutettua tiedostoa jossa 5 lisäystä ja 4 poistoa
  1. 0 1
      .travis.yml
  2. 5 3
      tests/runci/targets/Hl.hx

+ 0 - 1
.travis.yml

@@ -100,7 +100,6 @@ install_osx: &install_osx
   # Install dependencies
   - travis_retry brew update --merge
   - brew uninstall --force brew-cask # https://github.com/caskroom/homebrew-cask/pull/15381
-  - travis_retry brew tap Homebrew/bundle
   - travis_retry brew bundle --file=tests/Brewfile
   # install neko
   - if [ ! $DEPLOY_NIGHTLIES ]; then

+ 5 - 3
tests/runci/targets/Hl.hx

@@ -11,16 +11,18 @@ class Hl {
             infoMsg('hl has already been installed.');
             return;
         }
+        var hlSrc = Path.join([Sys.getEnv("HOME"), "hashlink"]);
+        runCommand("git", ["clone", "https://github.com/HaxeFoundation/hashlink.git", hlSrc]);
+
         switch (systemName) {
             case "Linux":
                 Linux.requireAptPackages(["libpng-dev", "libjpeg-turbo8-dev", "libturbojpeg", "zlib1g-dev", "libvorbis-dev"]);
             case "Mac":
-                runCommand("brew", ["install", "libpng", "jpeg-turbo", "libvorbis"], true);
+                runCommand("brew", ["bundle", '--file=${hlSrc}/Brewfile'], true);
             case "Windows":
                 //pass
         }
-        var hlSrc = Path.join([Sys.getEnv("HOME"), "hashlink"]);
-        runCommand("git", ["clone", "https://github.com/HaxeFoundation/hashlink.git", hlSrc]);
+
         var hlBuild = Path.join([Sys.getEnv("HOME"), "hashlink_build"]);
         FileSystem.createDirectory(hlBuild);
         var generator = systemName == "Windows" ? [] : ["-GNinja"];