From 0536b1e9e4bf6f15a38fe9d3d8b76d8b3187b6aa Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 15 Jun 2016 18:24:18 +0200 Subject: Clean up Windows provisioning scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The execution policy is set by the CI. The command usually fails as it is in the scritps right now since it must be run as admin. Change-Id: Ie31cb7fc15720cc6d76646bf475b3d60a02014d8 Reviewed-by: Jędrzej Nowacki --- coin/README | 2 ++ coin/provisioning/qtci-windows-10-x86/icu.ps1 | 5 ----- coin/provisioning/qtci-windows-10-x86/jom.ps1 | 5 ----- coin/provisioning/qtci-windows-10-x86_64/icu.ps1 | 5 ----- coin/provisioning/qtci-windows-10-x86_64/jom.ps1 | 5 ----- coin/provisioning/qtci-windows-7-x86/icu.ps1 | 5 ----- coin/provisioning/qtci-windows-7-x86/jom.ps1 | 5 ----- coin/provisioning/qtci-windows-8-x86/icu.ps1 | 5 ----- coin/provisioning/qtci-windows-8-x86/jom.ps1 | 5 ----- coin/provisioning/qtci-windows-8-x86_64/icu.ps1 | 5 ----- coin/provisioning/qtci-windows-8-x86_64/jom.ps1 | 5 ----- 11 files changed, 2 insertions(+), 50 deletions(-) (limited to 'coin') diff --git a/coin/README b/coin/README index 891d7202..2fb3fe2d 100644 --- a/coin/README +++ b/coin/README @@ -6,4 +6,6 @@ This directory contains files used by Qt's Continuous Integration system (Coin). provisioning ------------ Contains scripts that apply to different test machines in order to run automatic tests on them. +For Windows scripts, make sure that the machine has "Set-ExecutionPolicy RemoteSigned -Force" set. +(Run as admin in PowerShell) diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-10-x86/icu.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-10-x86/jom.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-7-x86/icu.ps1 b/coin/provisioning/qtci-windows-7-x86/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-7-x86/icu.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-7-x86/jom.ps1 b/coin/provisioning/qtci-windows-7-x86/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-7-x86/jom.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86/icu.ps1 b/coin/provisioning/qtci-windows-8-x86/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-8-x86/icu.ps1 +++ b/coin/provisioning/qtci-windows-8-x86/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86/jom.ps1 b/coin/provisioning/qtci-windows-8-x86/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-8-x86/jom.ps1 +++ b/coin/provisioning/qtci-windows-8-x86/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 +++ b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 +++ b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force -- cgit v1.2.3