Skip to content

Commit c18206d

Browse files
use VSCETARGET
1 parent 2a61c0e commit c18206d

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

build/azure-pipeline.pre-release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,8 @@ extends:
8888
- script: python -m nox --session install_bundled_libs -- ${{ variables.packageArch }}
8989
displayName: Install libraries
9090
env:
91-
npm_config_arch: ${{ variables.packageArch }}
92-
parameters: ${{ convertToJson(parameters) }}
93-
variables: ${{ convertToJson(variables) }}
91+
VSCETARGET: ${{ parameters.VSCETARGET }}
92+
VSCETARGET2: ${{ variables.VSCETARGET }}
9493

9594
- script: python ./build/update_ext_version.py --for-publishing
9695
displayName: Update build number

noxfile.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,17 +135,14 @@ def install_bundled_libs(session):
135135
"""Installs the libraries that will be bundled with the extension."""
136136
session.install("wheel")
137137
_install_bundle(session)
138-
print("args: ", session.posargs)
139-
print("enviro: ", os.environ.items)
140-
print("enviro: ", os.environ)
138+
target = os.environ.get('VSCETARGET')
139+
print("target: ", target)
141140

142-
143-
if session.posargs[0] == "Linux":
141+
if "linux" in target:
144142
download_url(f"{os.getcwd()}/bundled/libs", debugpy_urls["Linux"])
145-
elif session.posargs[0] == "Windows":
143+
elif "win32" in target:
146144
download_url(f"{os.getcwd()}/bundled/libs", debugpy_urls["Windows64"])
147-
148-
elif session.posargs[0] == "MacOS":
145+
elif "darwin" in target:
149146
download_url(f"{os.getcwd()}/bundled/libs", debugpy_urls["MacOS"])
150147
else:
151148
_install_package(f"{os.getcwd()}/bundled/libs", "debugpy")

0 commit comments

Comments
 (0)