Merge pull request #641 from iakov/pr/fix_emsdk_build

Pin EMSDK version for build where useful
miurahr · Feb 5, 2023 · 42bb9d4 · 42bb9d4
2 parents b348f2b + 7791083
commit 42bb9d4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/ci/generate_azure_pipelines_matrices.py b/ci/generate_azure_pipelines_matrices.py
@@ -35,7 +35,7 @@ def __init__(
         is_autodesktop: bool = False,
         tool_options: Optional[Dict[str, 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,
     ):
         self.command = command
@@ -410,7 +410,8 @@ def __init__(self, platform, build_jobs):
                 ("OUTPUT_DIR", build_job.output_dir if build_job.output_dir else ""),
                 ("QT_BINDIR", build_job.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()),
                 ("TOOL1_ARGS", build_job.tool_options.get("TOOL1_ARGS", "")),
                 ("LIST_TOOL1_CMD", build_job.tool_options.get("LIST_TOOL1_CMD", "")),

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

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -205,7 +205,6 @@ def test_cli_check_mirror():
     ),
 )
 def test_set_arch(arch: Optional[str], host: str, target: str, version: str, expect: Optional[str]):
-
     if not expect:
         with pytest.raises(CliInputError) as e:
             Cli._set_arch(arch, host, target, version)

diff --git a/tests/test_connection.py b/tests/test_connection.py
@@ -37,7 +37,7 @@ def test_cli_unknown_version(capsys):
     """
 
     matcher = re.compile(
-        r"^aqtinstall\(aqt\) v.* on Python 3.*\n"
+        r"[^\n]*aqtinstall\(aqt\) v.* on Python 3.*\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"==============================Suggested follow-up:==============================\n"

diff --git a/tests/test_helper.py b/tests/test_helper.py
@@ -127,7 +127,6 @@ def mocked_requests_get(*args, **kwargs):
 
 
 def test_helper_downloadBinary_md5(tmp_path, monkeypatch):
-
     monkeypatch.setattr(requests.Session, "get", mocked_requests_get)
 
     expected = binascii.unhexlify("1d41a93e4a585bb01e4518d4af431933")
@@ -136,7 +135,6 @@ def test_helper_downloadBinary_md5(tmp_path, monkeypatch):
 
 
 def test_helper_downloadBinary_sha256(tmp_path, monkeypatch):
-
     monkeypatch.setattr(requests.Session, "get", mocked_requests_get)
 
     expected = binascii.unhexlify("07b3ef4606b712923a14816b1cfe9649687e617d030fc50f948920d784c0b1cd")