aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2023-06-01 16:32:25 +0200
committerElias Toivola <elias.toivola@qt.io>2024-01-27 16:57:33 +0200
commit8c24e41c24e5987fcb93aa8fdbec3f3ab087b209 (patch)
tree4e0c868a828e3ff86efdaa4fa4e2e84fd6932cb2 /coin/provisioning
parent268cb978e2eb12685a2c315b455b3f2d8a8c9efb (diff)
Update node.js on Linux/macOS
Qt WebEngine 6.6 need 14.19+ Task-number: QTBUG-120927 Change-Id: Idf2d54fcdc55762cd9d8cfe5248858bd00afe89c Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit d764e8fe39675b10e8b4dc71c53f3406d356aef6) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'coin/provisioning')
-rwxr-xr-xcoin/provisioning/common/linux/install-nodejs.sh42
-rwxr-xr-xcoin/provisioning/common/macos/nodejs.sh8
-rwxr-xr-xcoin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh3
-rwxr-xr-xcoin/provisioning/qtci-linux-Debian-11.6-aarch64/03-install-nodejs.sh6
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/03-install-nodejs.sh6
7 files changed, 61 insertions, 7 deletions
diff --git a/coin/provisioning/common/linux/install-nodejs.sh b/coin/provisioning/common/linux/install-nodejs.sh
new file mode 100755
index 00000000..95a8a0e5
--- /dev/null
+++ b/coin/provisioning/common/linux/install-nodejs.sh
@@ -0,0 +1,42 @@
+#!/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
+
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+# This script will install node.js 18.16.0
+version="18.16.0"
+
+uname_m="$(uname -m)"
+case "$uname_m" in
+ x86_64|amd64)
+ sha256="44d93d9b4627fe5ae343012d855491d62c7381b236c347f7666a7ad070f26548"
+ pkgname="node-v$version-linux-x64.tar.xz"
+ dirname="node-v$version-linux-x64"
+ ;;
+ arm64|aarch64)
+ sha256="c81dfa0bada232cb4583c44d171ea207934f7356f85f9184b32d0dde69e2e0ea"
+ pkgname="node-v$version-linux-arm64.tar.xz"
+ dirname="node-v$version-linux-arm64"
+ ;;
+ *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
+esac
+
+internalUrl="http://ci-files01-hki.ci.qt.io/input/nodejs/$pkgname"
+externalUrl="https://nodejs.org/dist/v$version/$pkgname"
+
+targetFile="$HOME/$pkgname"
+DownloadURL "$internalUrl" "$externalUrl" "$sha256" "$targetFile"
+echo "Installing nodejs"
+tar -xJf "$targetFile" -C "$HOME"
+rm "$targetFile"
+
+installPrefix="/opt/$dirname"
+sudo mv "$HOME/$dirname" "$installPrefix"
+
+SetEnvVar "PATH" "$installPrefix/bin:\$PATH"
+
+echo "nodejs = $version" >> ~/versions.txt
diff --git a/coin/provisioning/common/macos/nodejs.sh b/coin/provisioning/common/macos/nodejs.sh
index 697169ae..ac927110 100755
--- a/coin/provisioning/common/macos/nodejs.sh
+++ b/coin/provisioning/common/macos/nodejs.sh
@@ -7,12 +7,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# This script will install Nodejs
-version="14.16.1"
-urlCache="http://ci-files01-hki.intra.qt.io/input/nodejs/node-v$version.pkg"
+version="18.16.0"
+urlCache="http://ci-files01-hki.ci.qt.io/input/nodejs/node-v$version.pkg"
urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg"
-sha1="4720274971c40fe51b2c647060f77c45fb4949a7"
+sha256="156aa5b9580288fb0b3c6134eb8fac64e50745d78d33eebe9e29eb7ff87b8e1e"
-DownloadURL $urlCache $urlOffcial $sha1 "/tmp/node-v$version.pkg"
+DownloadURL $urlCache $urlOffcial $sha256 "/tmp/node-v$version.pkg"
sudo installer -pkg "/tmp/node-v$version.pkg" -target /
echo "Nodejs = $version" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
index 367f669d..dd5a4596 100755
--- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
@@ -55,8 +55,7 @@ installPackages+=(libgbm-dev)
installPackages+=(libxkbfile-dev)
installPackages+=(libxshmfence-dev)
installPackages+=(libxss-dev)
-## installPackages+=(nodejs-mozilla) # use nodejs-mozilla because nodejs is outdated
-installPackages+=(nodejs)
+# installPackages+=(nodejs) too old
installPackages+=(python3-html5lib)
#
## Common event loop handling
diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/03-install-nodejs.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/03-install-nodejs.sh
new file mode 100755
index 00000000..07121a36
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/03-install-nodejs.sh
@@ -0,0 +1,6 @@
+#!/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
+
+# shellcheck source=../common/linux/install-nodejs.sh
+source "${BASH_SOURCE%/*}/../common/linux/install-nodejs.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh
index ceaed0f7..b83c85cb 100755
--- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh
@@ -64,6 +64,7 @@ installPackages+=(gperftools-libs)
installPackages+=(gperf)
installPackages+=(alsa-lib-devel)
installPackages+=(pulseaudio-libs-devel)
+installPackages+=(libuuid-devel)
installPackages+=(libXtst-devel)
installPackages+=(libxshmfence-devel)
installPackages+=(nspr-devel)
diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
index 628eee5f..1d486d19 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
@@ -68,7 +68,7 @@ installPackages+=(libvpx-dev)
installPackages+=(libxkbfile-dev)
installPackages+=(libxshmfence-dev)
installPackages+=(libxss-dev)
-installPackages+=(nodejs)
+# installPackages+=(nodejs) too old
installPackages+=(python3-html5lib)
# Common event loop handling
diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/03-install-nodejs.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/03-install-nodejs.sh
new file mode 100755
index 00000000..07121a36
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/03-install-nodejs.sh
@@ -0,0 +1,6 @@
+#!/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
+
+# shellcheck source=../common/linux/install-nodejs.sh
+source "${BASH_SOURCE%/*}/../common/linux/install-nodejs.sh"