Browse Source

[ci][mac] uninstall python2 & openssl (#9929)

* [mac] uninstall python2 & openssl

* [azure] don't unlink python2

* [actions] also remove openssl & python before flash9 tests

* do what error message suggests

* [actions] actually update github actions script

* [flash] move the workaround to ci/Flash.hx
Aleksandr Kuzmenko 4 years ago
parent
commit
7ae6999442

+ 11 - 2
.github/workflows/main.yml

@@ -268,9 +268,13 @@ jobs:
       - name: Install dependencies
         run: |
           set -ex
+          brew uninstall [email protected]
+          brew uninstall [email protected]
+          brew untap local/openssl
+          brew untap local/python2
           brew update
           # brew unlink python@2
-          brew bundle --file=tests/Brewfile --no-upgrade
+          brew bundle --file=tests/Brewfile --no-upgrade || brew link --overwrite awscli
       
       - name: Install OCaml libraries
         run: |
@@ -624,7 +628,12 @@ jobs:
       
       - name: Install homebrew packages
         if: matrix.BREW_PACKAGES
-        run: brew install ${{matrix.BREW_PACKAGES}}
+        run: |
+          brew uninstall [email protected]
+          brew uninstall [email protected]
+          brew untap local/openssl
+          brew untap local/python2
+          brew install ${{matrix.BREW_PACKAGES}}
       
       - name: Test
         run: |

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

@@ -15,9 +15,13 @@ jobs:
         submodules: recursive
       - script: |
           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 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
       - template: install-neko-snapshot.yaml
         parameters:

+ 5 - 1
extra/github-actions/build-mac.yml

@@ -1,9 +1,13 @@
 - name: Install dependencies
   run: |
     set -ex
+    brew uninstall [email protected]
+    brew uninstall [email protected]
+    brew untap local/openssl
+    brew untap local/python2
     brew update
     # brew unlink python@2
-    brew bundle --file=tests/Brewfile --no-upgrade
+    brew bundle --file=tests/Brewfile --no-upgrade || brew link --overwrite awscli
 
 - name: Install OCaml libraries
   run: |

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

@@ -76,6 +76,10 @@ class Flash {
 				if (commandResult("brew", ["cask", "list", "flash-player-debugger"]).exitCode == 0) {
 					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", ["cask", "install", "flash-player-debugger"]);