Skip to content

Commit

Permalink
Update relevant code paths and tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jaimergp committed Nov 18, 2024
1 parent a5af16a commit a1b2dea
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion conda_build/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,8 @@ def create_exe_file(directory, executable, target_platform):

if target_platform.endswith("32"):
executable_file = os.path.join(exe_directory, "cli-32.exe")

if target_platform.endswith("arm64"):
executable_file = os.path.join(exe_directory, "cli-arm64.exe")
else:
executable_file = os.path.join(exe_directory, "cli-64.exe")

Expand Down
2 changes: 1 addition & 1 deletion conda_build/noarch_python.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def transform(m, files, prefix):

# copy in windows exe shims if there are any python-scripts
if d["python-scripts"]:
for fn in "cli-32.exe", "cli-64.exe":
for fn in "cli-32.exe", "cli-64.exe", "cli-arm64.exe":
shutil.copyfile(join(this_dir, fn), join(prefix, fn))

# Read the local _link.py
Expand Down
3 changes: 2 additions & 1 deletion tests/test_codesigned.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ def signtool_unsupported() -> bool:

@pytest.mark.skipif(signtool_unsupported(), reason=signtool_unsupported_because())
@pytest.mark.parametrize(
"stub_file_name", ["cli-32.exe", "cli-64.exe", "gui-32.exe", "gui-64.exe"]
"stub_file_name",
["cli-32.exe", "cli-64.exe", "cli-arm64.exe", "gui-32.exe", "gui-64.exe", "cli-arm64.exe"],
)
def test_stub_exe_signatures(stub_file_name: str) -> None:
"""Verify that signtool verifies the signature of the stub exes"""
Expand Down

0 comments on commit a1b2dea

Please sign in to comment.