Skip to content

Commit

Permalink
VS 19 july 2022 (#114)
Browse files Browse the repository at this point in the history
* Visual Studio 2019 image update on July 1, 2022

.NET Core 3.1.420
Go 1.18.3, 1.17.11
PowerShell Core 7.2.5
Firefox 102.0
Microsoft Edge 103.0.1264.37
Google Chrome 103.0.5060.66
OpenSSL 1.1.1p, 3.0.4
Doxygen to 1.9.4

* Qt 6.3.1, 6.4.0 - added, 6.1 - removed

Qt

* Meson 0.62.1, LLVM 14.0.6, Visual Studio 2019 version 16.11.16

* Yarn 1.22.19

* Curl 7.84.0

* NuGet 6.2.1

* GitVersion 5.10.3

* Git 2.37.0

* Git LFS 3.2.0

* Ninja 1.11.0

* Mercurial 6.1.4

* Maven 3.8.6

* Disable Azure builds
  • Loading branch information
FeodorFitsner authored Jul 3, 2022
1 parent 3e9f1f8 commit d3d6303
Show file tree
Hide file tree
Showing 23 changed files with 279 additions and 120 deletions.
38 changes: 19 additions & 19 deletions appveyor-build-vs2019-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,6 @@ environment:
APPVEYOR_BUILD_WORKER_IMAGE: vs2019-temp-p1
APPVEYOR_BAKE_IMAGE: vs2019-master

# Azure
# =======

- job_name: VS 2019 on Azure West US - Part I
bake_phase: 1
APPVEYOR_BUILD_WORKER_IMAGE: base-windows-server-2019-dc-azure-westus
APPVEYOR_BAKE_IMAGE: vs2019-temp-p1-azure-westus

- job_name: VS 2019 on Azure West US - Wait for Part I image to be ready
bake_phase: wait-15-min
job_depends_on: VS 2019 on Azure West US - Part I

- job_name: VS 2019 on Azure West US - Part II
bake_phase: 3
job_depends_on: VS 2019 on Azure West US - Wait for Part I image to be ready
APPVEYOR_BUILD_WORKER_IMAGE: vs2019-temp-p1-azure-westus
APPVEYOR_BAKE_IMAGE: vs2019-master-azure-westus

# GCE
# =======

Expand All @@ -54,6 +36,24 @@ environment:
APPVEYOR_BUILD_WORKER_IMAGE: vs2019-temp-p1-gce-us-central1
APPVEYOR_BAKE_IMAGE: vs2019-master-gce-us-central1

# # Azure
# # =======

# - job_name: VS 2019 on Azure West US - Part I
# bake_phase: 1
# APPVEYOR_BUILD_WORKER_IMAGE: base-windows-server-2019-dc-azure-westus
# APPVEYOR_BAKE_IMAGE: vs2019-temp-p1-azure-westus

# - job_name: VS 2019 on Azure West US - Wait for Part I image to be ready
# bake_phase: wait-15-min
# job_depends_on: VS 2019 on Azure West US - Part I

# - job_name: VS 2019 on Azure West US - Part II
# bake_phase: 3
# job_depends_on: VS 2019 on Azure West US - Wait for Part I image to be ready
# APPVEYOR_BUILD_WORKER_IMAGE: vs2019-temp-p1-azure-westus
# APPVEYOR_BAKE_IMAGE: vs2019-master-azure-westus

init:
- appveyor version
- ps: $ErrorActionPreference = 'Stop'
Expand Down Expand Up @@ -224,7 +224,7 @@ for:
- ps: .\install_cmake.ps1
- ps: .\install_perl.ps1
- ps: .\install_llvm.ps1
- ps: .\install_llvm_extension_vs2019.ps1
#- ps: .\install_llvm_extension_vs2019.ps1
- ps: .\install_vcpkg.ps1
- ps: .\install_innosetup.ps1
- ps: .\install_coverity.ps1
Expand Down
14 changes: 7 additions & 7 deletions appveyor-fix-vs2019-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ environment:
APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master
APPVEYOR_BAKE_IMAGE: vs2019-master

# Azure
# =======

- job_name: VS 2019 on Azure West US
APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-azure-westus
APPVEYOR_BAKE_IMAGE: vs2019-master-azure-westus

# GCE
# =======

- job_name: VS 2019 on GCE us-central1
APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-gce-us-central1
APPVEYOR_BAKE_IMAGE: vs2019-master-gce-us-central1

# # Azure
# # =======

# - job_name: VS 2019 on Azure West US
# APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-azure-westus
# APPVEYOR_BAKE_IMAGE: vs2019-master-azure-westus

init:
- appveyor version
- ps: $ErrorActionPreference = 'Stop'
Expand Down
8 changes: 4 additions & 4 deletions scripts/Windows/install_curl.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ Write-Host "Installing curl..." -ForegroundColor Cyan

$destPath = 'C:\Tools\curl'

if(Test-Path $destPath) {
if (Test-Path $destPath) {
Remove-Item $destPath -Recurse -Force
}

$zipPath = "$env:TEMP\curl-7.79.1-win64-mingw.zip"
$zipPath = "$env:TEMP\curl-7.84.0_2-win64-mingw.zip"
$tempPath = "$env:TEMP\curl"
(New-Object Net.WebClient).DownloadFile('https://curl.se/windows/dl-7.79.1/curl-7.79.1-win64-mingw.zip', $zipPath)
(New-Object Net.WebClient).DownloadFile('https://curl.se/windows/dl-7.84.0_2/curl-7.84.0_2-win64-mingw.zip', $zipPath)
7z x $zipPath -aoa -o"$tempPath"
[IO.Directory]::Move("$tempPath\curl-7.79.1-win64-mingw", $destPath)
[IO.Directory]::Move("$tempPath\curl-7.84.0_2-win64-mingw", $destPath)

del $zipPath
Remove-Item $tempPath -Recurse -Force
Expand Down
2 changes: 1 addition & 1 deletion scripts/Windows/install_dotnet_core_sdks.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ $vs2022 = (Test-Path "${env:ProgramFiles}\Microsoft Visual Studio\2022")
if ($vs2019 -or $vs2022) {
Install-SDK "3.0.103"
Install-SDK "3.1.202"
Install-SDK "3.1.419"
Install-SDK "3.1.420"
}

# VS 2022 images only
Expand Down
4 changes: 2 additions & 2 deletions scripts/Windows/install_doxygen.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ Write-Host "Installing Doxygen..." -ForegroundColor Cyan

$destPath = 'C:\Tools\Doxygen'

if(Test-Path $destPath) {
if (Test-Path $destPath) {
Remove-Item $destPath -Recurse -Force
}

New-Item $destPath -ItemType directory -Force | Out-Null

$zipPath = "$env:TEMP\doxygen.zip"
(New-Object Net.WebClient).DownloadFile('https://www.doxygen.nl/files/doxygen-1.9.3.windows.x64.bin.zip', $zipPath)
(New-Object Net.WebClient).DownloadFile('https://www.doxygen.nl/files/doxygen-1.9.4.windows.x64.bin.zip', $zipPath)
7z x $zipPath -aoa -o"$destPath"
Remove-Item $zipPath

Expand Down
2 changes: 1 addition & 1 deletion scripts/Windows/install_firefox_browser.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if (test-path "${env:ProgramFiles(x86)}\Mozilla Firefox") {

Write-Host "Downloading..."
$exePath = "$env:TEMP\firefox-installer.exe"
(New-Object Net.WebClient).DownloadFile("https://download.mozilla.org/?product=firefox-100.0.2-ssl&os=$arch&lang=en-US", $exePath)
(New-Object Net.WebClient).DownloadFile("https://download.mozilla.org/?product=firefox-102.0-ssl&os=$arch&lang=en-US", $exePath)

Write-Host "Installing..."
cmd /c start /wait $exePath -ms
Expand Down
4 changes: 2 additions & 2 deletions scripts/Windows/install_git.ps1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Write-Host "Installing Git 2.33.1"
Write-Host "Installing Git 2.37.0"
Write-Host "====================="

[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12

$exePath = "$env:TEMP\Git-install.exe"

Write-Host "Downloading..."
(New-Object Net.WebClient).DownloadFile('https://github.com/git-for-windows/git/releases/download/v2.33.1.windows.1/Git-2.33.1-64-bit.exe', $exePath)
(New-Object Net.WebClient).DownloadFile('https://github.com/git-for-windows/git/releases/download/v2.37.0.windows.1/Git-2.37.0-64-bit.exe', $exePath)

Write-Host "Installing..."
cmd /c start /wait $exePath /VERYSILENT /NORESTART /NOCANCEL /SP- /NOICONS /COMPONENTS="icons,icons\quicklaunch,ext,ext\reg,ext\reg\shellhere,ext\reg\guihere,assoc,assoc_sh" /LOG
Expand Down
2 changes: 1 addition & 1 deletion scripts/Windows/install_git_lfs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ del "${env:ProgramFiles}\Git\mingw64\bin\git-lfs.exe" -ErrorAction SilentlyConti
$exePath = "$env:TEMP\git-lfs-windows.exe"

Write-Host "Downloading..."
(New-Object Net.WebClient).DownloadFile('https://github.com/git-lfs/git-lfs/releases/download/v3.0.2/git-lfs-windows-v3.0.2.exe', $exePath)
(New-Object Net.WebClient).DownloadFile('https://github.com/git-lfs/git-lfs/releases/download/v3.2.0/git-lfs-windows-v3.2.0.exe', $exePath)

Write-Host "Installing..."
cmd /c start /wait $exePath /VERYSILENT /SUPPRESSMSGBOXES /NORESTART
Expand Down
13 changes: 8 additions & 5 deletions scripts/Windows/install_gitversion.ps1
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
Write-Host "Installing GitVersion..." -ForegroundColor Cyan
$gvPath = "$env:SYSTEMDRIVE\Tools\GitVersion"
if(Test-Path $gvPath) {
if (Test-Path $gvPath) {
Remove-Item $gvPath -Recurse -Force
}

$tempPath = "$env:TEMP\GitVersion"
nuget install gitversion.commandline -Version 5.7.0 -ExcludeVersion -OutputDirectory $tempPath
Write-Host "Downloading GitVersion..."
$zipPath = "$env:TEMP\gitversion.zip"
(New-Object Net.WebClient).DownloadFile('https://github.com/GitTools/GitVersion/releases/download/5.10.3/gitversion-win-x64-5.10.3.zip', $zipPath)

Write-Host "Unpacking GitVersion..."
7z x $zipPath -aoa -o"$gvPath" | Out-Null
Remove-Item $zipPath

[IO.Directory]::Move("$tempPath\gitversion.commandline\tools", $gvPath)
Remove-Item $tempPath -Recurse -Force
Add-Path $gvPath
Write-Host "GitVersion installed" -ForegroundColor Green
4 changes: 2 additions & 2 deletions scripts/Windows/install_go.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

$go_versions = @(
@{
"version" = "1.18.2"
"version" = "1.18.3"
"folder" = "go118"
}
)

if (-not $env:INSTALL_LATEST_ONLY) {
$go_versions = $go_versions + @(
@{
"version" = "1.17.10"
"version" = "1.17.11"
"folder" = "go117"
}
@{
Expand Down
2 changes: 1 addition & 1 deletion scripts/Windows/install_llvm.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$llvmVersion = "12.0.1"
$llvmVersion = "14.0.6"
Write-Host "Installing LLVM $llvmVersion ..." -ForegroundColor Cyan
Write-Host "Downloading..."
$exePath = "$env:temp\LLVM-$llvmVersion-win64.exe"
Expand Down
10 changes: 5 additions & 5 deletions scripts/Windows/install_maven.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Write-Host "Installing Apache Maven 3.8.5 ..." -ForegroundColor Cyan
Write-Host "Installing Apache Maven 3.8.6 ..." -ForegroundColor Cyan

$apachePath = "${env:ProgramFiles(x86)}\Apache"
$mavenPath = "$apachePath\Maven"
Expand All @@ -12,12 +12,12 @@ if (-not (Test-Path $apachePath)) {
}

Write-Host "Downloading..."
$zipPath = "$env:TEMP\apache-maven-3.8.5-bin.zip"
(New-Object Net.WebClient).DownloadFile('https://dlcdn.apache.org/maven/maven-3/3.8.5/binaries/apache-maven-3.8.5-bin.zip', $zipPath)
$zipPath = "$env:TEMP\apache-maven-3.8.6-bin.zip"
(New-Object Net.WebClient).DownloadFile('https://dlcdn.apache.org/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.zip', $zipPath)

Write-Host "Unpacking..."
7z x $zipPath -oC:\apache-maven | Out-Null
[IO.Directory]::Move('C:\apache-maven\apache-maven-3.8.5', $mavenPath)
[IO.Directory]::Move('C:\apache-maven\apache-maven-3.8.6', $mavenPath)
Remove-Item 'C:\apache-maven' -Recurse -Force
Remove-Item $zipPath

Expand All @@ -29,4 +29,4 @@ Add-SessionPath "$mavenPath\bin"

mvn --version

Write-Host "Apache Maven 3.8.5 installed" -ForegroundColor Green
Write-Host "Apache Maven 3.8.6 installed" -ForegroundColor Green
4 changes: 2 additions & 2 deletions scripts/Windows/install_mercurial.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Write-Host "===================="

Write-Host "Downloading..."
$msiPath = "$env:TEMP\mercurial-6.0-x64.msi"
(New-Object Net.WebClient).DownloadFile('https://www.mercurial-scm.org/release/windows/mercurial-6.0-x64.msi', $msiPath)
$msiPath = "$env:TEMP\mercurial-6.1.4-x64.msi"
(New-Object Net.WebClient).DownloadFile('https://www.mercurial-scm.org/release/windows/mercurial-6.1.4-x64.msi', $msiPath)

Write-Host "Installing..."
cmd /c start /wait msiexec /i $msiPath /quiet
Expand Down
4 changes: 2 additions & 2 deletions scripts/Windows/install_meson_and_ninja.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Write-Host "Installing Meson and Ninja..." -ForegroundColor Cyan

$mesonUrl = 'https://github.com/mesonbuild/meson/releases/download/0.61.1/meson-0.61.1-64.msi'
$ninjaUrl = 'https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip'
$mesonUrl = 'https://github.com/mesonbuild/meson/releases/download/0.62.1/meson-0.62.1-64.msi'
$ninjaUrl = 'https://github.com/ninja-build/ninja/releases/download/v1.11.0/ninja-win.zip'

Write-Host "Downloading..."
$msiPath = "$env:TEMP\meson.msi"
Expand Down
8 changes: 5 additions & 3 deletions scripts/Windows/install_nuget.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$nugetVersion = '5.11.0'
$nugetVersion = '6.2.1'
$nugetUrl = "https://dist.nuget.org/win-x86-commandline/v$nugetVersion/nuget.exe"

$nugetDir = "$env:SystemDrive\Tools\NuGet3"
Expand All @@ -10,10 +10,12 @@ if (-not (Test-Path $nugetDir)) {
New-Item $nugetDir -ItemType Directory -Force | Out-Null
Add-Path $nugetDir
Add-SessionPath $nugetDir
} else {
}
else {
Write-Host "Updating NuGet in $nugetDir"
}
} else {
}
else {
Write-Host "Updating NuGet in $nugetDir"
}

Expand Down
14 changes: 7 additions & 7 deletions scripts/Windows/install_openssl.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$110Letter = "L"
$111Letter = "o"
$111Letter = "p"
$102Letter = "u"

function GetUninstallString($productName) {
Expand Down Expand Up @@ -84,30 +84,30 @@ UninstallOpenSSL "OpenSSL 1.1.1$111Letter (64-bit)"

# -----------------------------------------------------------------------------------------------------------------

Write-Host "Installing OpenSSL 3.0.3 32-bit ..." -ForegroundColor Cyan
Write-Host "Installing OpenSSL 3.0.4 32-bit ..." -ForegroundColor Cyan
Write-Host "Downloading..."
$exePath = "$env:temp\Win32OpenSSL-3_0_3.exe"
(New-Object Net.WebClient).DownloadFile("https://slproweb.com/download/Win32OpenSSL-3_0_3.exe", $exePath)
(New-Object Net.WebClient).DownloadFile("https://slproweb.com/download/Win32OpenSSL-3_0_4.exe", $exePath)
if (-not (Test-Path $exePath)) { throw "Unable to find $exePath" }
Write-Host "Installing..."
cmd /c start /wait $exePath /silent /verysilent /sp- /suppressmsgboxes /DIR=C:\OpenSSL-v30-Win32-temp
Remove-Item $exePath
Write-Host "Installed" -ForegroundColor Green
Copy-Item C:\OpenSSL-v30-Win32-temp -Destination C:\OpenSSL-v30-Win32 -Recurse

Write-Host "Installing OpenSSL 3.0.3 64-bit ..." -ForegroundColor Cyan
Write-Host "Installing OpenSSL 3.0.4 64-bit ..." -ForegroundColor Cyan
Write-Host "Downloading..."
$exePath = "$env:temp\Win64OpenSSL-3_0_3.exe"
(New-Object Net.WebClient).DownloadFile("https://slproweb.com/download/Win64OpenSSL-3_0_3.exe", $exePath)
(New-Object Net.WebClient).DownloadFile("https://slproweb.com/download/Win64OpenSSL-3_0_4.exe", $exePath)
if (-not (Test-Path $exePath)) { throw "Unable to find $exePath" }
Write-Host "Installing..."
cmd /c start /wait $exePath /silent /verysilent /sp- /suppressmsgboxes /DIR=C:\OpenSSL-v30-Win64-temp
Remove-Item $exePath
Write-Host "Installed" -ForegroundColor Green
Copy-Item C:\OpenSSL-v30-Win64-temp -Destination C:\OpenSSL-v30-Win64 -Recurse

UninstallOpenSSL "OpenSSL 3.0.3 (32-bit)"
UninstallOpenSSL "OpenSSL 3.0.3 (64-bit)"
UninstallOpenSSL "OpenSSL 3.0.4 (32-bit)"
UninstallOpenSSL "OpenSSL 3.0.4 (64-bit)"

# -----------------------------------------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion scripts/Windows/install_powershell_core.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$version = '7.2.4'
$version = '7.2.5'

Write-Host "Installing PowerShell Core $version"
Write-Host "=========================="
Expand Down
Loading

0 comments on commit d3d6303

Please sign in to comment.