diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-22 10:46:59 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-08-18 11:31:42 +0200 |
| commit | c4b8c908b6796b1cfe4d2712bc6bb014b2eae8eb (patch) | |
| tree | 27a06b1570b9550ec65c73b8a2c3702dc8e2ecd3 | |
| parent | 51c0f68cb9255551bab56ef278f509b91151d540 (diff) | |
Update node.js to 12
For Ubuntu it means using an alternative packages, for
openSUSE not using an alternative package.
Pick-to: 6.2
Change-Id: I09085428db083adc1ff1d68f384cd19c83605bfd
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh | 4 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh index 62274e0d..f9ebdb3c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh @@ -90,8 +90,7 @@ installPackages+=(libgbm-dev) installPackages+=(libxkbfile-dev) installPackages+=(libxshmfence-dev) installPackages+=(libxss-dev) -installPackages+=(nodejs) -# NOTE! Can't install nodejs-dev because libssl1.0-dev conflicts with libssl1.0-dev which is depandency of nodejs-dev. +installPackages+=(nodejs-mozilla) # use nodejs-mozilla because nodejs is outdated # Common event loop handling installPackages+=(libglib2.0-dev) @@ -231,6 +230,7 @@ pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" +SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh index 0fcab74d..9c81732d 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh @@ -37,7 +37,7 @@ sudo zypper -nq install libicu-devel # qtwebengine sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \ libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ - mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel glproto-devel \ + mozilla-nspr-devel mozilla-nss-devel nodejs12 glproto-devel \ libxshmfence-devel libXdamage-devel # qtwebkit |