Skip to content

Commit 9d9f656

Browse files
committed
download patch script into parent path on windows, so it doesn't get cleaned
1 parent af58950 commit 9d9f656

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/build-windows-amd64-wheels.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Install dependencies
2323
run: |
2424
Invoke-WebRequest https://kumisystems.dl.sourceforge.net/project/gnuwin32/patch/2.5.9-7/patch-2.5.9-7-bin.zip -OutFile patch.zip
25-
Expand-Archive patch.zip
25+
Expand-Archive patch.zip -DestinationPath ../patch -Force
2626
- name: Checkout
2727
uses: actions/checkout@v3
2828
- name: Setup custom GraalPy
@@ -45,7 +45,7 @@ jobs:
4545
- name: Build wheel
4646
run: |-
4747
$env:PIP_FIND_LINKS=$PWD
48-
$env:PATH+=";$PWD\graalpy\bin;$PWD\graalpy\Scripts;$PWD\patch\bin"
48+
$env:PATH+=";$PWD\graalpy\bin;$PWD\graalpy\Scripts;$PWD\..\patch\bin"
4949
graalpy/bin/graalpy -m pip wheel --find-links $PWD numpy
5050
graalpy/bin/graalpy -m pip wheel --find-links $PWD numpy==1.21.6
5151
graalpy/bin/graalpy -m pip wheel --find-links $PWD numpy==1.22.4
@@ -69,7 +69,7 @@ jobs:
6969
- name: Install dependencies
7070
run: |
7171
Invoke-WebRequest https://kumisystems.dl.sourceforge.net/project/gnuwin32/patch/2.5.9-7/patch-2.5.9-7-bin.zip -OutFile patch.zip
72-
Expand-Archive patch.zip
72+
Expand-Archive patch.zip -DestinationPath ../patch -Force
7373
- name: Checkout
7474
uses: actions/checkout@v3
7575
- name: Setup custom GraalPy
@@ -97,7 +97,7 @@ jobs:
9797
- name: Build wheel
9898
run: |-
9999
$env:PIP_FIND_LINKS=$PWD
100-
$env:PATH+=";$PWD\graalpy\bin;$PWD\graalpy\Scripts;$PWD\patch\bin"
100+
$env:PATH+=";$PWD\graalpy\bin;$PWD\graalpy\Scripts;$PWD\..\patch\bin"
101101
graalpy/bin/graalpy -m pip wheel --find-links $PWD PyYAML
102102
- name: Store wheels
103103
uses: umutozd/upload-artifact@5c459179e7745e2c730c50b10a6459da0b6f25db
@@ -117,7 +117,7 @@ jobs:
117117
- name: Install dependencies
118118
run: |
119119
Invoke-WebRequest https://kumisystems.dl.sourceforge.net/project/gnuwin32/patch/2.5.9-7/patch-2.5.9-7-bin.zip -OutFile patch.zip
120-
Expand-Archive patch.zip
120+
Expand-Archive patch.zip -DestinationPath ../patch -Force
121121
- name: Checkout
122122
uses: actions/checkout@v3
123123
- name: Setup custom GraalPy
@@ -145,7 +145,7 @@ jobs:
145145
- name: Build wheel
146146
run: |-
147147
$env:PIP_FIND_LINKS=$PWD
148-
$env:PATH+=";$PWD\graalpy\bin;$PWD\graalpy\Scripts;$PWD\patch\bin"
148+
$env:PATH+=";$PWD\graalpy\bin;$PWD\graalpy\Scripts;$PWD\..\patch\bin"
149149
graalpy/bin/graalpy -m pip wheel --find-links $PWD ujson
150150
- name: Store wheels
151151
uses: umutozd/upload-artifact@5c459179e7745e2c730c50b10a6459da0b6f25db

scripts/wheelbuilder/wheelbuilder/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def install_cmd(self, packages: list[str]) -> list[str]:
110110
case "windows":
111111
return [
112112
"Invoke-WebRequest https://kumisystems.dl.sourceforge.net/project/gnuwin32/patch/2.5.9-7/patch-2.5.9-7-bin.zip -OutFile patch.zip",
113-
"Expand-Archive patch.zip",
113+
"Expand-Archive patch.zip -DestinationPath ../patch -Force",
114114
f"winget install --force --silent --disable-interactivity --accept-package-agreements {' '.join(packages)}" if packages else "",
115115
]
116116
raise RuntimeError(f"Invalid platform spec {self.name}")
@@ -146,7 +146,7 @@ def build_cmd(self, cmds: list[str]) -> list[str]:
146146
case "windows":
147147
return [
148148
"$env:PIP_FIND_LINKS=$PWD",
149-
'$env:PATH+=";$PWD\\graalpy\\bin;$PWD\\graalpy\\Scripts;$PWD\\patch\\bin"',
149+
'$env:PATH+=";$PWD\\graalpy\\bin;$PWD\\graalpy\\Scripts;$PWD\\..\\patch\\bin"',
150150
] + cmds
151151
raise RuntimeError(f"Invalid platform spec {self.name}")
152152

0 commit comments

Comments
 (0)