aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2020-12-19 16:14:02 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2020-12-21 07:50:15 +0200
commit15e9dd1c7c299c9e780a015c39a0d172f8ef7bb2 (patch)
tree16f52576348d62f07d3ae63935c37f41ab12e169
parentbf9b9f9b988fca415edc26882eac06bdc9d66f70 (diff)
Change installation order in macOS 10.13
Nodejs installation fails with dependencies because symlinks already exists. Let's install homebrew and nodejs first before xz and python3. Also Opennebula installation needs to be before Nodejs installation, because brew will install another Openssl version as dependecy for nodejs and it can cause conflicts. Task-number: QTQAINFRA-4105 Change-Id: Ieea94eb118b5f2b71381ee24b8602e76813e35ea Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/07-openssl-sh (renamed from coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh)0
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/08-homebrew.sh (renamed from coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh)0
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh (renamed from coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh)0
3 files changed, 0 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/07-openssl-sh
index 44fa76f1..44fa76f1 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/07-openssl-sh
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.13-x86_64/08-homebrew.sh
index f7f9e214..f7f9e214 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/08-homebrew.sh
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh
index ab992405..ab992405 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh