Merge pull request #1 from randomir/adapt-ci-for-leapide-fork

CI: build vsix on leapide-* branches and PRs
dwavesystems · Mar 18, 2022 · 62f6ebf · 62f6ebf
2 parents 9c21f7c + 5dc999a
commit 62f6ebf
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,6 +7,14 @@ on:
       - 'release'
       - 'release/*'
       - 'release-*'
+      - 'leapide-*'
+  pull_request:
+    branches:
+      - main
+      - 'release'
+      - 'release/*'
+      - 'release-*'
+      - 'leapide-*'
 
 env:
   NODE_VERSION: 12.15.0
@@ -21,7 +29,7 @@ env:
 jobs:
   setup:
     name: Set up
-    if: github.repository == 'microsoft/vscode-python'
+    #if: github.repository == 'microsoft/vscode-python'
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -43,7 +51,7 @@ jobs:
 
   build-vsix:
     name: Build VSIX
-    if: github.repository == 'microsoft/vscode-python'
+    #if: github.repository == 'microsoft/vscode-python'
     needs: setup
     runs-on: ubuntu-latest
     steps:

diff --git a/pythonFiles/install_debugpy.py b/pythonFiles/install_debugpy.py
@@ -9,7 +9,8 @@
 EXTENSION_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 DEBUGGER_DEST = os.path.join(EXTENSION_ROOT, "pythonFiles", "lib", "python")
 DEBUGGER_PACKAGE = "debugpy"
-DEBUGGER_PYTHON_VERSIONS = ("cp39",)
+DEBUGGER_PYTHON_ABI_VERSIONS = ("cp39",)
+DEBUGGER_VERSION = "1.5.0"  # can also be "latest"
 
 
 def _contains(s, parts=()):
@@ -28,35 +29,34 @@ def _get_debugger_wheel_urls(data, version):
     return list(
         r["url"]
         for r in data["releases"][version]
-        if _contains(r["url"], DEBUGGER_PYTHON_VERSIONS)
+        if _contains(r["url"], DEBUGGER_PYTHON_ABI_VERSIONS)
     )
 
 
 def _download_and_extract(root, url, version):
     root = os.getcwd() if root is None or root == "." else root
-    prefix = os.path.join("debugpy-{0}.data".format(version), "purelib")
+    print(url)
     with url_lib.urlopen(url) as response:
-        # Extract only the contents of the purelib subfolder (parent folder of debugpy),
-        # since debugpy files rely on the presence of a 'debugpy' folder.
-        with zipfile.ZipFile(io.BytesIO(response.read()), "r") as wheel:
+        data = response.read()
+        with zipfile.ZipFile(io.BytesIO(data), "r") as wheel:
             for zip_info in wheel.infolist():
                 # Ignore dist info since we are merging multiple wheels
-                if ".dist-info" in zip_info.filename:
+                if ".dist-info/" in zip_info.filename:
                     continue
-                # Normalize path for Windows, the wheel folder structure
-                # uses forward slashes.
-                normalized = os.path.normpath(zip_info.filename)
-                # Flatten the folder structure.
-                zip_info.filename = normalized.split(prefix)[-1]
-                wheel.extract(zip_info, root)
+                print("\t" + zip_info.filename)
+                wheel.extract(zip_info.filename, root)
 
 
 def main(root):
     data = _get_package_data()
-    latest_version = max(data["releases"].keys(), key=version_parser)
 
-    for url in _get_debugger_wheel_urls(data, latest_version):
-        _download_and_extract(root, url, latest_version)
+    if DEBUGGER_VERSION == "latest":
+        use_version = max(data["releases"].keys(), key=version_parser)
+    else:
+        use_version = DEBUGGER_VERSION
+
+    for url in _get_debugger_wheel_urls(data, use_version):
+        _download_and_extract(root, url, use_version)
 
 
 if __name__ == "__main__":