From 1c1557aa93cd139688ebfe5a9922a60ef2b2d8c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Sat, 6 Jan 2018 20:24:01 +0200 Subject: Provisioning: Set CMake to PATH on Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ubuntu uses .profile file instead of .bashrc. We need to use the correct file accordingly. Task-number: QTBUG-65594 (cherry picked from commit 22e4664eb08dc5384c5afd0bd6c6a0725b242517) Change-Id: Iceeec53882f1a5c97cd8f7ea5b013d543c156acb Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/cmake_linux.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh index 35313d3c..3efe35a0 100755 --- a/coin/provisioning/common/cmake_linux.sh +++ b/coin/provisioning/common/cmake_linux.sh @@ -50,4 +50,8 @@ appPrefix="cmake-$version-Linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc +if uname -a |grep -q "Ubuntu"; then + echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.profile +else + echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc +fi -- cgit v1.2.3 From 6a875b9f81ee6dfaadde0d61ba6e7f8637d67668 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 16 Jan 2018 13:54:12 +0100 Subject: Fix checksum for QNX 7 SDK download Change-Id: Ia37c6d032d1a4c2841482292a2c2c2f8fd468859 Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index 18ce0581..a7a8c035 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -38,7 +38,7 @@ $zip = "c:\users\qt\downloads\qnx700.7z" Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z -OutFile $zip -Verify-Checksum $zip "2eab8bcf993056f79c9e2585c9c05e05658ba8bb" +Verify-Checksum $zip "DD3346A3429C06B59BF4D45CE0782F737D2424C7" Extract-7Zip $zip C:\ [Environment]::SetEnvironmentVariable("QNX_700", "C:\QNX700", "Machine") -- cgit v1.2.3 From b1198d34020f2aa291943ac5ee2a7a1eb19dbaf3 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 18 Jan 2018 11:37:57 +0100 Subject: Fix provisioning: Wait for msvc-2013 update 5 to finish MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Installing Update 5 for Visual Studio 2013 Update 5 (KB2829760)... Removing C:\Windows\Temp\vs12-kb2829760.exe ... Caught System.UnauthorizedAccessException Access to the path 'C:\Windows\Temp\vs12-kb2829760.exe' is denied. Change-Id: I9fe136f0361ee21e38563dd17bf76bf4fd53747f Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 index 202d072d..447e7b1f 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 @@ -40,10 +40,9 @@ $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe" echo "Fetching patch for Visual Studio $version..." Copy-Item $url_cache $package -$commandLine = $package echo "Installing Update 5 for Visual Studio $version..." -. $commandLine /norestart /passive +Start-Process -FilePath $package -ArgumentList "/norestart /passive" -Wait echo "Removing $package ..." remove-item $package -- cgit v1.2.3 From b86b3a757b473e86aae7f246d2f1a8e0ae8e54b7 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 17 Jan 2018 17:56:20 +0100 Subject: Fix provisioning: NotePad++ path on 64 bit windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We install the 64 bit version of np++ which is installed in the regular program files folder. Change-Id: I702210eaf7dfae75bbfcfd9cc98d8ed96d775f61 Reviewed-by: Tony Sarajärvi Reviewed-by: Oliver Wolff --- coin/provisioning/common/windows/install-notepad++.ps1 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/windows/install-notepad++.ps1 b/coin/provisioning/common/windows/install-notepad++.ps1 index a6e20d5e..4fad6f6d 100644 --- a/coin/provisioning/common/windows/install-notepad++.ps1 +++ b/coin/provisioning/common/windows/install-notepad++.ps1 @@ -57,11 +57,6 @@ Remove-Item -Recurse -Force "$nppPackage" echo "Notepad++ = $version" >> ~\versions.txt -if( (is64bitWinHost) -eq 1 ) { - Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled" -} -else { - Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled" -} +Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled" echo "Auto-updating disabled." -- cgit v1.2.3 From 99595f44f1b3a3c35d8decc671a8933f65220cf3 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 17 Jan 2018 15:57:27 +0100 Subject: Provisioning: Fix disabling windows updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On some machines the updates were already disabled, which lead to the call to disable the service failing. Now we just move on without error. Change-Id: Ia48f7164c23dfe24e24548558d582cdc0190b7e3 Reviewed-by: Frederik Gladhorn Reviewed-by: Tony Sarajärvi --- .../common/windows/disable-windows-updates.ps1 | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/windows/disable-windows-updates.ps1 b/coin/provisioning/common/windows/disable-windows-updates.ps1 index 1a014733..05215e20 100644 --- a/coin/provisioning/common/windows/disable-windows-updates.ps1 +++ b/coin/provisioning/common/windows/disable-windows-updates.ps1 @@ -33,5 +33,22 @@ # This script disables the automatic Windows updates -stop-service wuauserv -set-service wuauserv –startup disabled +$service = get-service wuauserv +if (-not $service) { + Write-Host "Windows Update service not found." + exit 0 +} + +if ($service.Status -eq "Stopped") { + Write-Host "Windows Update service already stopped." +} else { + Write-Host "Stopping Windows Update service." + stop-service wuauserv +} + +$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode" +if ($startup -ne "Disabled") { + set-service wuauserv -startup disabled +} else { + Write-Host "Windows Update service startup already disabled." +} -- cgit v1.2.3 From 786be66eaf2bf35c75ca534930cbc87c52634e8d Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 10 Jan 2018 10:02:32 +0200 Subject: Move exception throw to the correct line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This throw was placed on the echo line instead of the actual command. Change-Id: I907c2ce17afa64c9c4ef628d766d7dfe270ade59 Reviewed-by: Konstantin Tokarev Reviewed-by: Edward Welbourne Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index 60e637b7..5d36f57b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -52,8 +52,8 @@ ExceptionProxy=104 try ( - echo "Set timezone to UTC" || throw $ExceptionTimezone - sudo timedatectl set-timezone Etc/UTC + echo "Set timezone to UTC." + sudo timedatectl set-timezone Etc/UTC || throw $ExceptionTimezone echo "Timeout for blanking the screen (0 = never)" gsettings set org.gnome.desktop.session idle-delay 0 || throw $ExceptionGsettings1 echo "Prevents screen lock when screesaver goes active." -- cgit v1.2.3