Skip to content

Commit 02c761d

Browse files
committed
Bring bach win free-threaded service and only use the same dockerfile
1 parent 3b69589 commit 02c761d

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

ci/docker/python-wheel-windows-vs2022.dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ RUN $msix_url = 'https://www.python.org/ftp/python/installer/python.msix'; \
3636
Add-AppxPackage .\python.msix
3737

3838
# Use python_abi_tag env var to select regular or free-threaded Python
39-
ARG python_abi_tag=cp310
40-
ENV PYTHON_ABI_TAG=${python_abi_tag}
41-
RUN if ($env:PYTHON_ABI_TAG -match 't$') { \
39+
ARG freethreaded=0
40+
ENV PYTHON_MODE=${freethreaded}
41+
RUN if ($env:PYTHON_MODE -eq '1') { \
4242
pymanager install --version $env:PYTHON_VERSION --variant freethreaded \
4343
} else { \
4444
pymanager install --version $env:PYTHON_VERSION \

compose.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ x-hierarchy:
176176
- python-free-threaded-wheel-musllinux-test-unittests
177177
- python-wheel-windows-vs2022-base:
178178
- python-wheel-windows-vs2022
179+
- python-free-threaded-wheel-windows-vs2022
179180
- python-wheel-windows-test-base:
180181
- python-wheel-windows-test
181182
- python-free-threaded-wheel-windows-test
@@ -1403,7 +1404,7 @@ services:
14031404
args:
14041405
base: ${REPO}:python-wheel-windows-vs2022-base-vcpkg-${VCPKG}-${PYTHON_WHEEL_WINDOWS_IMAGE_REVISION}
14051406
python: ${PYTHON}
1406-
python_abi_tag: ${PYTHON_ABI_TAG}
1407+
freethreaded: 0
14071408
context: .
14081409
dockerfile: ci/docker/python-wheel-windows-vs2022.dockerfile
14091410
# This should make the pushed images reusable, but the image gets rebuilt.
@@ -1414,6 +1415,23 @@ services:
14141415
volumes: *python-wheel-windows-vs2022-volumes
14151416
command: arrow\\ci\\scripts\\python_wheel_windows_build.bat
14161417

1418+
python-free-threaded-wheel-windows-vs2022:
1419+
image: ${REPO}:python-${PYTHON}-free-threaded-wheel-windows-vs2022-vcpkg-${VCPKG}-${PYTHON_WHEEL_WINDOWS_IMAGE_REVISION}
1420+
build:
1421+
args:
1422+
base: ${REPO}:python-wheel-windows-vs2022-base-vcpkg-${VCPKG}-${PYTHON_WHEEL_WINDOWS_IMAGE_REVISION}
1423+
python: ${PYTHON}
1424+
freethreaded: 1
1425+
context: .
1426+
dockerfile: ci/docker/python-wheel-windows-vs2022.dockerfile
1427+
# This should make the pushed images reusable, but the image gets rebuilt.
1428+
# Uncomment if no local cache is available.
1429+
# cache_from:
1430+
# - mcr.microsoft.com/windows/servercore:ltsc2022
1431+
# - ${REPO}:python-${PYTHON}-free-threaded-wheel-windows-vs2022-vcpkg-${VCPKG}-${PYTHON_WHEEL_WINDOWS_IMAGE_REVISION}
1432+
volumes: *python-wheel-windows-vs2022-volumes
1433+
command: arrow\\ci\\scripts\\python_wheel_windows_build.bat
1434+
14171435
python-wheel-windows-test-base:
14181436
image: ${REPO}:python-wheel-windows-test-vs2022-base-${PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION}
14191437
build:

0 commit comments

Comments
 (0)