Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-17 20:54:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pin EMSDK version for build where useful

Browse Source 
Also fix test that fails at the moment
This commit is contained in:
iakov
2023-02-03 12:05:57 +03:00
parent b348f2b7e6
commit bc10ba9e85
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ci/generate_azure_pipelines_matrices.py
View File

@@ -35,7 +35,7 @@ class BuildJob:
is_autodesktop: bool = False, is_autodesktop: bool = False,
tool_options: Optional[Dict[str, str]] = None, tool_options: Optional[Dict[str, str]] = None,
check_output_cmd: Optional[str] = None, check_output_cmd: Optional[str] = None,
emsdk_version: str = "sdk-fastcomp-1.38.27-64bit", emsdk_version: str = "sdk-fastcomp-1.38.27-64bit@3.1.29",
autodesk_arch_folder: Optional[str] = None, autodesk_arch_folder: Optional[str] = None,
): ):
self.command = command self.command = command
@@ -410,7 +410,8 @@ for platform_build_job in all_platform_build_jobs:
("OUTPUT_DIR", build_job.output_dir if build_job.output_dir else ""), ("OUTPUT_DIR", build_job.output_dir if build_job.output_dir else ""),
("QT_BINDIR", build_job.qt_bindir()), ("QT_BINDIR", build_job.qt_bindir()),
("WIN_QT_BINDIR", build_job.win_qt_bindir()), ("WIN_QT_BINDIR", build_job.win_qt_bindir()),
("EMSDK_VERSION", build_job.emsdk_version), ("EMSDK_VERSION", (build_job.emsdk_version+"@main").split('@')[0]),
("EMSDK_TAG", (build_job.emsdk_version+"@main").split('@')[1]),
("WIN_AUTODESK_QT_BINDIR", build_job.win_autodesk_qt_bindir()), ("WIN_AUTODESK_QT_BINDIR", build_job.win_autodesk_qt_bindir()),
("TOOL1_ARGS", build_job.tool_options.get("TOOL1_ARGS", "")), ("TOOL1_ARGS", build_job.tool_options.get("TOOL1_ARGS", "")),
("LIST_TOOL1_CMD", build_job.tool_options.get("LIST_TOOL1_CMD", "")), ("LIST_TOOL1_CMD", build_job.tool_options.get("LIST_TOOL1_CMD", "")),

6
ci/steps.yml
View File

@@ -318,8 +318,8 @@ steps:
##---------------------------------------------------- ##----------------------------------------------------
# wasm_32 on linux and mac # wasm_32 on linux and mac
- script: | - script: |
set -ex set -uex
git clone https://github.com/emscripten-core/emsdk.git git clone --depth=1 --branch=$(EMSDK_TAG) https://github.com/emscripten-core/emsdk.git
cd emsdk cd emsdk
./emsdk install $(EMSDK_VERSION) ./emsdk install $(EMSDK_VERSION)
./emsdk activate --embedded $(EMSDK_VERSION) ./emsdk activate --embedded $(EMSDK_VERSION)
@@ -347,7 +347,7 @@ steps:
# wasm_32 on Windows cmd.exe # wasm_32 on Windows cmd.exe
- powershell: | - powershell: |
git clone https://github.com/emscripten-core/emsdk.git git clone --depth=1 --branch=$(EMSDK_TAG) https://github.com/emscripten-core/emsdk.git
cd emsdk cd emsdk
.\emsdk install $(EMSDK_VERSION) .\emsdk install $(EMSDK_VERSION)
.\emsdk activate --embedded $(EMSDK_VERSION) .\emsdk activate --embedded $(EMSDK_VERSION)

2
tests/test_connection.py
View File

@@ -37,7 +37,7 @@ def test_cli_unknown_version(capsys):
""" """
matcher = re.compile( matcher = re.compile(
r"^aqtinstall\(aqt\) v.* on Python 3.*\n" r"^INFO : aqtinstall\(aqt\) v.* on Python 3.*\n"
r".*Specified Qt version is unknown: " + re.escape(wrong_version) + r"\.\n" r".*Specified Qt version is unknown: " + re.escape(wrong_version) + r"\.\n"
r".*Failed to locate XML data for Qt version '" + re.escape(wrong_version) + r"'\.\n" r".*Failed to locate XML data for Qt version '" + re.escape(wrong_version) + r"'\.\n"
r"==============================Suggested follow-up:==============================\n" r"==============================Suggested follow-up:==============================\n"