diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-06 19:13:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-06 19:13:20 -0500 |
| commit | 8667cb327da62c067bca6b70acccd959ed832a81 (patch) | |
| tree | 5636a68cef21fd33eaa06c793a1339944af8e69c | |
| parent | b628b6ef8e8520a0137a4c82307ec3fbda40b890 (diff) | |
| parent | 860422d1dc53ff7c699ba92c01b08c603291211f (diff) | |
| download | servo-8667cb327da62c067bca6b70acccd959ed832a81.tar.gz servo-8667cb327da62c067bca6b70acccd959ed832a81.zip | |
Auto merge of #22123 - Darkspirit:https_taskcluster_windows, r=jdm
Ensuring https for Windows Taskcluster
This should be a safe change as there're already some https downloads on Windows Taskcluster. Examples:
* with `$client.DownloadFile()`: https://github.com/servo/servo/blob/78327fcba5a0bcabc8411327ae1aa175bbaf5f49/etc/taskcluster/windows/bootstrap.ps1#L43
* with `Expand-ZIPFile`: https://github.com/servo/servo/blob/e217672c1ab665a68aca36bb5086956254604e75/etc/taskcluster/windows/bootstrap.ps1#L40
Modern TLS is supported:
https://www.hardenize.com/report/download.tuxfamily.org#www_tls
https://www.hardenize.com/report/nssm.cc#www_tls
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22123)
<!-- Reviewable:end -->
| -rw-r--r-- | etc/taskcluster/windows/bootstrap.ps1 | 13 | ||||
| -rw-r--r-- | etc/taskcluster/windows/first-boot.ps1 | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/etc/taskcluster/windows/bootstrap.ps1 b/etc/taskcluster/windows/bootstrap.ps1 index 4b64c19e39a..ae21cac0ed7 100644 --- a/etc/taskcluster/windows/bootstrap.ps1 +++ b/etc/taskcluster/windows/bootstrap.ps1 @@ -10,13 +10,6 @@ [EnvironmentVariableTarget]::Machine) -# Optional -$client.DownloadFile( - "http://download.tuxfamily.org/dvorak/windows/bepo.exe", - "C:\bepo.exe" -) - - # use TLS 1.2 (see bug 1443595) [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 @@ -35,6 +28,12 @@ function Expand-ZIPFile($file, $destination, $url) } } +# Optional +$client.DownloadFile( + "https://download.tuxfamily.org/dvorak/windows/bepo.exe", + "C:\bepo.exe" +) + md C:\git Expand-ZIPFile -File "C:\git.zip" -Destination "C:\git" -Url ` "https://github.com/git-for-windows/git/releases/download/v2.19.0.windows.1/MinGit-2.19.0-64-bit.zip" diff --git a/etc/taskcluster/windows/first-boot.ps1 b/etc/taskcluster/windows/first-boot.ps1 index 6c3106d7a0c..db72fee468f 100644 --- a/etc/taskcluster/windows/first-boot.ps1 +++ b/etc/taskcluster/windows/first-boot.ps1 @@ -40,7 +40,7 @@ $client.DownloadFile("https://github.com/taskcluster/generic-worker/releases/dow $client.DownloadFile("https://github.com/taskcluster/livelog/releases/download" + "/v1.1.0/livelog-windows-amd64.exe", "C:\generic-worker\livelog.exe") Expand-ZIPFile -File "C:\nssm-2.24.zip" -Destination "C:\" ` - -Url "http://www.nssm.cc/release/nssm-2.24.zip" + -Url "https://www.nssm.cc/release/nssm-2.24.zip" Start-Process C:\generic-worker\generic-worker.exe -ArgumentList ` "new-openpgp-keypair --file C:\generic-worker\generic-worker-gpg-signing-key.key" ` -Wait -NoNewWindow -PassThru ` |