From 25ec1c6058278afd3fa4d0de30b1c1d9c60ba0ec Mon Sep 17 00:00:00 2001 From: Hiroshi Miura Date: Tue, 7 Jan 2020 07:16:10 +0900 Subject: [PATCH] CI: update wasm emsdk version (#78) * CI: update wasm emsdk version Fix broken link and ask to install latest with fastcomp backend * CI: Test wasm on Qt 5.14.0 Signed-off-by: Hiroshi Miura * CI: Update openssl version Signed-off-by: Hiroshi Miura --- azure-pipelines.yml | 2 +- ci/generate_azure_pipelines_matrices.py | 6 +++--- ci/steps.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d643076..995bd13 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -62,7 +62,7 @@ jobs: PYTHON_VERSION: '3.7' HOST: linux TOOL_NAME: tools_openssl_x64 - TOOL_VERSION: 1.1.1-0 + TOOL_VERSION: 1.1.1-4 ARCH: qt.tools.openssl.gcc_64 TEST_EXECUTABLE: OpenSSL/binary/bin/openssl TEST_COMMAND: version diff --git a/ci/generate_azure_pipelines_matrices.py b/ci/generate_azure_pipelines_matrices.py index 03878be..41be9dc 100644 --- a/ci/generate_azure_pipelines_matrices.py +++ b/ci/generate_azure_pipelines_matrices.py @@ -50,7 +50,7 @@ for qt_version in qt_versions: # WASM linux_build_jobs.append( - BuildJob('5.13.2', 'linux', 'desktop', 'wasm_32', "wasm_32") + BuildJob('5.14.0', 'linux', 'desktop', 'wasm_32', "wasm_32") ) # Mac Desktop @@ -66,7 +66,7 @@ mac_build_jobs.append( # WASM mac_build_jobs.append( - BuildJob('5.13.2', 'mac', 'desktop', 'wasm_32', "wasm_32") + BuildJob('5.14.0', 'mac', 'desktop', 'wasm_32', "wasm_32") ) # Windows Desktop @@ -79,7 +79,7 @@ windows_build_jobs.extend( # WASM windows_build_jobs.append( - BuildJob('5.13.2', 'windows', 'desktop', 'wasm_32', "wasm_32") + BuildJob('5.14.0', 'windows', 'desktop', 'wasm_32', "wasm_32") ) windows_build_jobs.extend( diff --git a/ci/steps.yml b/ci/steps.yml index 4f9fb2c..9507ec8 100644 --- a/ci/steps.yml +++ b/ci/steps.yml @@ -166,8 +166,8 @@ steps: - script: | git clone https://github.com/emscripten-core/emsdk.git cd emsdk - ./emsdk install sdk-1.38.27-64bit - ./emsdk activate --embedded sdk-1.38.27-64bit + ./emsdk install sdk-fastcomp-1.38.27-64bit + ./emsdk activate --embedded sdk-fastcomp-1.38.27-64bit workingDirectory: $(Build.BinariesDirectory) condition: and(eq( variables['ARCH'], 'wasm_32' ), or(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OS'], 'Darwin'))) displayName: 'Install Emscripten SDK'