Explorar o código

[ci] fix building on mac

Aleksandr Kuzmenko %!s(int64=4) %!d(string=hai) anos
pai
achega
bc87c70926
Modificáronse 2 ficheiros con 10 adicións e 2 borrados
  1. 6 2
      extra/azure-pipelines/build-mac.yml
  2. 4 0
      tests/runci/targets/Flash.hx

+ 6 - 2
extra/azure-pipelines/build-mac.yml

@@ -15,9 +15,13 @@ jobs:
         submodules: recursive
         submodules: recursive
       - script: |
       - script: |
           set -ex
           set -ex
+          brew uninstall [email protected]
+          brew uninstall [email protected]
+          brew untap local/openssl
+          brew untap local/python2
           brew update || brew update || brew update
           brew update || brew update || brew update
-          brew unlink python@2
-          brew bundle --file=tests/Brewfile --no-upgrade
+          # brew unlink python@2
+          brew bundle --file=tests/Brewfile --no-upgrade || brew link --overwrite awscli
         displayName: Install dependencies
         displayName: Install dependencies
       - template: install-neko-snapshot.yaml
       - template: install-neko-snapshot.yaml
         parameters:
         parameters:

+ 4 - 0
tests/runci/targets/Flash.hx

@@ -76,6 +76,10 @@ class Flash {
 				if (commandResult("brew", ["cask", "list", "flash-player-debugger"]).exitCode == 0) {
 				if (commandResult("brew", ["cask", "list", "flash-player-debugger"]).exitCode == 0) {
 					return;
 					return;
 				}
 				}
+				runCommand("brew", ["uninstall", "[email protected]"]);
+				runCommand("brew", ["uninstall", "[email protected]"]);
+				runCommand("brew", ["untap", "local/openssl"]);
+				runCommand("brew", ["untap", "local/python2"]);
 				runCommand("brew", ["update"]);
 				runCommand("brew", ["update"]);
 				runCommand("brew", ["cask", "install", "flash-player-debugger"]);
 				runCommand("brew", ["cask", "install", "flash-player-debugger"]);