Skip to content

Commit 57c645c

Browse files
henryiiimayeut
authored andcommitted
fix(action): no need to modify path for extras
Signed-off-by: Henry Schreiner <henryfs@princeton.edu>
1 parent ba10ff3 commit 57c645c

File tree

1 file changed

+4
-21
lines changed

1 file changed

+4
-21
lines changed

action.yml

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -73,47 +73,30 @@ runs:
7373
shutil.rmtree(venv_path)
7474
builder = EnvBuilder()
7575
builder.create(venv_path)
76-
exposed_binaries = {"cibuildwheel"}
77-
if "uv" in EXTRAS:
78-
exposed_binaries.add("uv")
79-
clean_bin_path = builder.bin_path.parent / f"{builder.bin_path.name}.clean"
80-
clean_bin_path.mkdir()
81-
for path in list(builder.bin_path.iterdir()):
82-
if path.stem in exposed_binaries:
83-
try:
84-
os.symlink(path, clean_bin_path / path.name)
85-
except OSError:
86-
import shutil
87-
88-
shutil.copy2(path, clean_bin_path / path.name)
89-
full_path = f"{clean_bin_path}{os.pathsep}{os.environ['PATH']}"
76+
cibw_path = [path for path in builder.bin_path.glob("cibuildwheel*") if path.stem == "cibuildwheel"][0]
9077
with open(os.environ["GITHUB_OUTPUT"], "at") as f:
91-
f.write(f"updated-path={full_path}\n")
78+
f.write(f"cibw-path={cibw_path}\n")
9279
print("::endgroup::")
9380
EOF
9481
shell: bash
9582

9683
# Redirecting stderr to stdout to fix interleaving issue in Actions.
9784
- run: >
98-
cibuildwheel
85+
"${{ steps.cibw.outputs.cibw-path }}"
9986
"${{ inputs.package-dir }}"
10087
${{ inputs.output-dir != '' && format('--output-dir "{0}"', inputs.output-dir) || ''}}
10188
${{ inputs.config-file != '' && format('--config-file "{0}"', inputs.config-file) || ''}}
10289
${{ inputs.only != '' && format('--only "{0}"', inputs.only) || ''}}
10390
2>&1
104-
env:
105-
PATH: "${{ steps.cibw.outputs.updated-path }}"
10691
shell: bash
10792
if: runner.os != 'Windows'
10893
10994
# Windows needs powershell to interact nicely with Meson
11095
- run: >
111-
cibuildwheel
96+
& "${{ steps.cibw.outputs.cibw-path }}"
11297
"${{ inputs.package-dir }}"
11398
${{ inputs.output-dir != '' && format('--output-dir "{0}"', inputs.output-dir) || ''}}
11499
${{ inputs.config-file != '' && format('--config-file "{0}"', inputs.config-file) || ''}}
115100
${{ inputs.only != '' && format('--only "{0}"', inputs.only) || ''}}
116-
env:
117-
PATH: "${{ steps.cibw.outputs.updated-path }}"
118101
shell: pwsh
119102
if: runner.os == 'Windows'

0 commit comments

Comments
 (0)