Fix CI

azure-pipelines.yml

@@ -36,50 +36,54 @@ stages:
           name: Mac
           staticDeps: 'false'
 
-      - template: extra/azure-pipelines/build-windows.yml
-        parameters:
-          name: WinVS2015
-          vmImage: vs2015-win2012r2
-          cmakeGenerator: Visual Studio 14 2015
-      - template: extra/azure-pipelines/build-windows.yml
-        parameters:
-          name: WinVS2015x64
-          vmImage: vs2015-win2012r2
-          cmakeGenerator: Visual Studio 14 2015 Win64
-
       - template: extra/azure-pipelines/build-windows.yml
         parameters:
           name: WinVS2017
           vmImage: vs2017-win2016
           cmakeGenerator: Visual Studio 15 2017
+          arch: Win32
       - template: extra/azure-pipelines/build-windows.yml
         parameters:
           name: WinVS2017x64
           vmImage: vs2017-win2016
           cmakeGenerator: Visual Studio 15 2017 Win64
+          arch: x64
+
+      - template: extra/azure-pipelines/build-windows.yml
+        parameters:
+          name: WinVS2019
+          vmImage: windows-2019
+          cmakeGenerator: Visual Studio 16 2019
+          arch: Win32
+      - template: extra/azure-pipelines/build-windows.yml
+        parameters:
+          name: WinVS2019x64
+          vmImage: windows-2019
+          cmakeGenerator: Visual Studio 16 2019
+          arch: x64
 
       - job: Chocolatey
         dependsOn:
-          - WinVS2015
-          - WinVS2015x64
+          - WinVS2017
+          - WinVS2017x64
         pool:
           vmImage: windows-2019
         steps:
           - task: DownloadPipelineArtifact@0
             inputs:
-              artifactName: WinVS2015Binaries
-              targetPath: WinVS2015Binaries
-            displayName: Download WinVS2015Binaries
+              artifactName: WinVS2017Binaries
+              targetPath: WinVS2017Binaries
+            displayName: Download WinVS2017Binaries
           - task: DownloadPipelineArtifact@0
             inputs:
-              artifactName: WinVS2015x64Binaries
-              targetPath: WinVS2015x64Binaries
-            displayName: Download WinVS2015x64Binaries
+              artifactName: WinVS2017x64Binaries
+              targetPath: WinVS2017x64Binaries
+            displayName: Download WinVS2017x64Binaries
           - bash: |
               set -ex
               cp LICENSE extra/chocolatey/
-              cp WinVS2015Binaries/neko-*.zip extra/chocolatey/
-              cp WinVS2015x64Binaries/neko-*.zip extra/chocolatey/
+              cp WinVS2017Binaries/neko-*.zip extra/chocolatey/
+              cp WinVS2017x64Binaries/neko-*.zip extra/chocolatey/
               ls -la extra/chocolatey/
             displayName: Prepare extra/chocolatey/
           - powershell: |
@@ -104,7 +108,7 @@ stages:
       - job: S3
         condition: and(succeeded(), variables['HXBUILDS_AWS_ACCESS_KEY_ID'], variables['HXBUILDS_S3ADDR'])
         pool:
-          vmImage: 'ubuntu-16.04'
+          vmImage: 'ubuntu-20.04'
         steps:
           - task: DownloadPipelineArtifact@0
             inputs:
@@ -118,14 +122,14 @@ stages:
             displayName: Download MacStaticBinaries
           - task: DownloadPipelineArtifact@0
             inputs:
-              artifactName: WinVS2015Binaries
-              targetPath: WinVS2015Binaries
-            displayName: Download WinVS2015Binaries
+              artifactName: WinVS2017Binaries
+              targetPath: WinVS2017Binaries
+            displayName: Download WinVS2017Binaries
           - task: DownloadPipelineArtifact@0
             inputs:
-              artifactName: WinVS2015x64Binaries
-              targetPath: WinVS2015x64Binaries
-            displayName: Download WinVS2015x64Binaries
+              artifactName: WinVS2017x64Binaries
+              targetPath: WinVS2017x64Binaries
+            displayName: Download WinVS2017x64Binaries
           - task: DownloadPipelineArtifact@0
             inputs:
               artifactName: Chocolatey
@@ -144,7 +148,7 @@ stages:
               FILE_NAME=neko_${COMMIT_DATE}_$(Build.SourceBranchName)_${COMMIT_HASH_SHORT}
               aws s3 cp LinuxStaticBinaries/neko-*.tar.gz  $(HXBUILDS_S3ADDR)/neko/linux64/${FILE_NAME}.tar.gz
               aws s3 cp MacStaticBinaries/neko-*.tar.gz    $(HXBUILDS_S3ADDR)/neko/mac/${FILE_NAME}.tar.gz
-              aws s3 cp WinVS2015Binaries/neko-*.zip       $(HXBUILDS_S3ADDR)/neko/windows/${FILE_NAME}.zip
+              aws s3 cp WinVS2017Binaries/neko-*.zip       $(HXBUILDS_S3ADDR)/neko/windows/${FILE_NAME}.zip
               aws s3 cp Chocolatey/*.nupkg                 $(HXBUILDS_S3ADDR)/neko/windows64-choco/
             env:
               AWS_ACCESS_KEY_ID: $(HXBUILDS_AWS_ACCESS_KEY_ID)
@@ -154,8 +158,8 @@ stages:
               set -ex
               aws s3 cp LinuxStaticBinaries/neko-*.tar.gz  $(HXBUILDS_S3ADDR)/neko/linux64/neko_latest.tar.gz
               aws s3 cp MacStaticBinaries/neko-*.tar.gz    $(HXBUILDS_S3ADDR)/neko/mac/neko_latest.tar.gz
-              aws s3 cp WinVS2015Binaries/neko-*.zip       $(HXBUILDS_S3ADDR)/neko/windows/neko_latest.zip
-              aws s3 cp WinVS2015x64Binaries/neko-*.zip    $(HXBUILDS_S3ADDR)/neko/windows64/neko_latest.zip
+              aws s3 cp WinVS2017Binaries/neko-*.zip       $(HXBUILDS_S3ADDR)/neko/windows/neko_latest.zip
+              aws s3 cp WinVS2017x64Binaries/neko-*.zip    $(HXBUILDS_S3ADDR)/neko/windows64/neko_latest.zip
 
               # Chocolatey packages have to be named with version number,
               # so let's use web redirection to keep the original file name.

cmake/patch_mariadb.cmake

@@ -10,5 +10,17 @@ string(REPLACE
 	content ${content}
 )
 
+file(WRITE ${cmakelists} ${content})
+
+set(cmakelists ${mariadb_source}/cmake/ConnectorName.cmake)
+
+file(READ ${cmakelists} content)
+
+# Fix broken syntax on newer CMake
+string(REPLACE
+	"  END()"
+	"  ENDIF()"
+	content ${content}
+)
 
 file(WRITE ${cmakelists} ${content})

extra/azure-pipelines/Brewfile-STATIC_DEPS_NONE

@@ -3,5 +3,5 @@ brew "ninja"
 brew "pkg-config"
 brew "bdw-gc"
 brew "mariadb-connector-c"
-brew "mbedtls"
+brew "mbedtls@2", link: true
 brew "pcre"

extra/azure-pipelines/build-linux.yml

@@ -1,6 +1,6 @@
 parameters:
   name: 'BuildLinux'
-  vmImage: 'ubuntu-16.04'
+  vmImage: 'ubuntu-20.04'
   staticDeps: 'true'
   config: 'RelWithDebInfo'
 

extra/azure-pipelines/build-mac.yml

@@ -1,6 +1,6 @@
 parameters:
   name: 'BuildMac'
-  vmImage: 'macOS-10.13'
+  vmImage: 'macOS-10.14'
   staticDeps: 'true'
   config: 'RelWithDebInfo'
 
@@ -18,6 +18,8 @@ jobs:
     steps:
       - script: |
           set -ex
+          sudo rm -rf /Library/Frameworks/Python.framework
+          brew cleanup
           brew update
           brew bundle --file="$(BREWFILE)"
         displayName: Install dependencies

extra/azure-pipelines/build-windows.yml

@@ -2,24 +2,29 @@ parameters:
   name: 'BuildWindows'
   vmImage: ''
   cmakeGenerator: ''
+  arch: ''
   config: 'RelWithDebInfo'
 
 jobs:
   - job: ${{ parameters.name }}
     pool:
       vmImage: ${{ parameters.vmImage }}
     steps:
-      - ${{ if eq(parameters.vmImage, 'vs2015-win2012r2') }}:
+      - ${{ if eq(parameters.vmImage, 'vs2017-win2016') }}:
         - powershell: |
             Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
             Write-Host "##vso[task.prependpath]C:\ProgramData\chocolatey\bin"
           displayName: Install Chocolatey
       - powershell: |
-          choco install activeperl --version 5.24.3.2404001 -y
+          choco install activeperl -y
           Write-Host "##vso[task.prependpath]C:\Perl64\bin"
         displayName: Install Perl
-      - script: cmake . -G "${{ parameters.cmakeGenerator }}"
-        displayName: CMake
+      - ${{ if eq(parameters.vmImage, 'vs2017-win2016') }}:
+        - script: cmake . -G "${{ parameters.cmakeGenerator }}"
+          displayName: CMake
+      - ${{ if eq(parameters.vmImage, 'windows-2019') }}:
+        - script: cmake . -G "${{ parameters.cmakeGenerator }}" -A ${{ parameters.arch }}
+          displayName: CMake
       - script: |
           cmake --build . --config ${{ parameters.config }} --target download_static_deps || \
           cmake --build . --config ${{ parameters.config }} --target download_static_deps || \
@@ -38,7 +43,7 @@ jobs:
       - task: PublishPipelineArtifact@0
         inputs:
           artifactName: ${{ parameters.name }}Binaries
-          ${{ if not(contains(parameters.cmakeGenerator, 'Win64')) }}:
+          ${{ if eq(parameters.arch, 'Win32') }}:
             targetPath: bin/neko-$(NEKO_VERSION)-win.zip
-          ${{ if contains(parameters.cmakeGenerator, 'Win64') }}:
+          ${{ if eq(parameters.arch, 'x64') }}:
             targetPath: bin/neko-$(NEKO_VERSION)-win64.zip

extra/chocolatey/neko.nuspec

@@ -20,7 +20,7 @@
         <releaseNotes>https://github.com/HaxeFoundation/neko/blob/master/CHANGES</releaseNotes>
         <tags>neko haxe vm admin</tags>
         <dependencies>
-            <dependency id="vcredist2015" version="14.0.24215.20170201" />
+            <dependency id="vcredist2017" version="14.16.27033" />
         </dependencies>
     </metadata>
 </package>

libs/mysql/CMakeLists.txt

@@ -42,7 +42,7 @@ if (STATIC_OPENSSL)
 	endif()
 	ExternalProject_Add(OpenSSL
 		${EP_CONFIGS}
-		URL https://www.openssl.org/source/openssl-1.1.1.tar.gz
+		URL https://www.openssl.org/source/old/1.1.1/openssl-1.1.1.tar.gz
 		URL_MD5 7079eb017429e0ffb9efb42bf80ccb21
 		${OPENSSL_CONFS}
 		PATCH_COMMAND ${CMAKE_COMMAND} -Dopenssl_source=${CMAKE_BINARY_DIR}/libs/src/openssl -P ${CMAKE_SOURCE_DIR}/cmake/patch_openssl.cmake
@@ -88,7 +88,7 @@ if (STATIC_MARIADBCONNECTOR)
 	ExternalProject_Add(MariaDBConnector
 		${EP_CONFIGS}
 		DEPENDS ${OPENSSL_DEP}
-		URL https://downloads.mariadb.org/f/connector-c-3.0.9/mariadb-connector-c-3.0.9-src.tar.gz
+		URL https://downloads.mariadb.com/Connectors/c/connector-c-3.0.9/mariadb-connector-c-3.0.9-src.tar.gz
 		URL_MD5 e7fdb17e26e779f4bd15b6a32e1c8472
 		CMAKE_ARGS
 			-Wno-dev