From 66fd8fb132d69618cf763750569668b78d92e510 Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Wed, 17 Sep 2025 07:25:51 +0300 Subject: [PATCH] Provisioning: Fix macos nodejs installation Brew install started to fail on older macos arm versions. Getting rid of all brew install to avoid future problems with it. Task-number: QTAINFRA-7408 Pick-to: 6.10 6.9 6.8 6.5 Change-Id: I22eddfad1f49b0814841a5d554100fdffd329593 Reviewed-by: Jukka Jokiniva --- coin/provisioning/qtci-macos-11-arm/30-nodejs.sh | 5 ++--- coin/provisioning/qtci-macos-12-arm/30-nodejs.sh | 5 ++--- coin/provisioning/qtci-macos-13-arm/30-nodejs.sh | 5 ++--- coin/provisioning/qtci-macos-14-arm/30-nodejs.sh | 5 ++--- coin/provisioning/qtci-macos-15-arm/30-nodejs.sh | 5 ++--- coin/provisioning/qtci-macos-26-arm/30-nodejs.sh | 5 ++--- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/coin/provisioning/qtci-macos-11-arm/30-nodejs.sh b/coin/provisioning/qtci-macos-11-arm/30-nodejs.sh index 8f73b2d6..a5cf7d4d 100755 --- a/coin/provisioning/qtci-macos-11-arm/30-nodejs.sh +++ b/coin/provisioning/qtci-macos-11-arm/30-nodejs.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash #Copyright (C) 2023 The Qt Company Ltd #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - set -ex -brew install nodejs - +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/nodejs.sh" diff --git a/coin/provisioning/qtci-macos-12-arm/30-nodejs.sh b/coin/provisioning/qtci-macos-12-arm/30-nodejs.sh index 8f73b2d6..a5cf7d4d 100755 --- a/coin/provisioning/qtci-macos-12-arm/30-nodejs.sh +++ b/coin/provisioning/qtci-macos-12-arm/30-nodejs.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash #Copyright (C) 2023 The Qt Company Ltd #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - set -ex -brew install nodejs - +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/nodejs.sh" diff --git a/coin/provisioning/qtci-macos-13-arm/30-nodejs.sh b/coin/provisioning/qtci-macos-13-arm/30-nodejs.sh index 8f73b2d6..a5cf7d4d 100755 --- a/coin/provisioning/qtci-macos-13-arm/30-nodejs.sh +++ b/coin/provisioning/qtci-macos-13-arm/30-nodejs.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash #Copyright (C) 2023 The Qt Company Ltd #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - set -ex -brew install nodejs - +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/nodejs.sh" diff --git a/coin/provisioning/qtci-macos-14-arm/30-nodejs.sh b/coin/provisioning/qtci-macos-14-arm/30-nodejs.sh index 8f73b2d6..a5cf7d4d 100755 --- a/coin/provisioning/qtci-macos-14-arm/30-nodejs.sh +++ b/coin/provisioning/qtci-macos-14-arm/30-nodejs.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash #Copyright (C) 2023 The Qt Company Ltd #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - set -ex -brew install nodejs - +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/nodejs.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/30-nodejs.sh b/coin/provisioning/qtci-macos-15-arm/30-nodejs.sh index 8f73b2d6..a5cf7d4d 100755 --- a/coin/provisioning/qtci-macos-15-arm/30-nodejs.sh +++ b/coin/provisioning/qtci-macos-15-arm/30-nodejs.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash #Copyright (C) 2023 The Qt Company Ltd #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - set -ex -brew install nodejs - +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/nodejs.sh" diff --git a/coin/provisioning/qtci-macos-26-arm/30-nodejs.sh b/coin/provisioning/qtci-macos-26-arm/30-nodejs.sh index 8f73b2d6..a5cf7d4d 100755 --- a/coin/provisioning/qtci-macos-26-arm/30-nodejs.sh +++ b/coin/provisioning/qtci-macos-26-arm/30-nodejs.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash #Copyright (C) 2023 The Qt Company Ltd #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - set -ex -brew install nodejs - +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/nodejs.sh"