This is an automated email from the ASF dual-hosted git repository.

raulcd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new 02a165922e GH-45076: [CI][Packaging][Python] Simplify 
dev/tasks/python-wheels/github.linux.yml (#45077)
02a165922e is described below

commit 02a165922e46e5ed6dd3ed2446141cd0922a7c54
Author: Sutou Kouhei <[email protected]>
AuthorDate: Fri Dec 20 20:16:51 2024 +0900

    GH-45076: [CI][Packaging][Python] Simplify 
dev/tasks/python-wheels/github.linux.yml (#45077)
    
    ### Rationale for this change
    
    We can use GitHub Actions' standard features not Jinja2 features to 
generate test image names.
    
    ### What changes are included in this PR?
    
    Use `GITHUB_ENV` instead of Jinja2.
    
    ### Are these changes tested?
    
    Yes.
    
    ### Are there any user-facing changes?
    
    No.
    
    * GitHub Issue: https://github.com/apache/arrow/issues/45076
    
    Authored-by: Sutou Kouhei <[email protected]>
    Signed-off-by: Raúl Cumplido <[email protected]>
---
 dev/tasks/python-wheels/github.linux.yml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/dev/tasks/python-wheels/github.linux.yml 
b/dev/tasks/python-wheels/github.linux.yml
index 8ddd0a2309..ec5b9b31da 100644
--- a/dev/tasks/python-wheels/github.linux.yml
+++ b/dev/tasks/python-wheels/github.linux.yml
@@ -19,16 +19,6 @@
 
 {{ macros.github_header() }}
 
-# Testing free-threaded wheels uses a different Docker setup
-{% set test_imports_image = (
-    'python-free-threaded-wheel-manylinux-test-imports' if python_abi_tag == 
'cp313t'
-    else 'python-wheel-manylinux-test-imports')
-%}
-{% set test_unittests_image = (
-    'python-free-threaded-wheel-manylinux-test-unittests' if python_abi_tag == 
'cp313t'
-    else 'python-wheel-manylinux-test-unittests')
-%}
-
 permissions:
   packages: write
 
@@ -60,6 +50,15 @@ jobs:
       {{ macros.github_install_archery()|indent }}
       {{ macros.github_login_dockerhub()|indent }}
 
+      - name: Prepare
+        run: |
+          if [ "${PYTHON_ABI_TAG}" = "cp313t" ]; then
+            test_image_prefix=python-free-threaded
+          else
+            test_image_prefix=python
+          fi
+          echo "TEST_IMAGE_PREFIX=${test_image_prefix}" >> ${GITHUB_ENV}
+
       - name: Build wheel
         shell: bash
         env:
@@ -85,8 +84,8 @@ jobs:
         shell: bash
         run: |
           source arrow/ci/scripts/util_enable_core_dumps.sh
-          archery docker run {{ test_imports_image }}
-          archery docker run {{ test_unittests_image }}
+          archery docker run ${TEST_IMAGE_PREFIX}-wheel-manylinux-test-imports
+          archery docker run 
${TEST_IMAGE_PREFIX}-wheel-manylinux-test-unittests
 
       - name: Test wheel on AlmaLinux 8
         shell: bash
@@ -158,5 +157,5 @@ jobs:
         shell: bash
         run: |
           archery docker push python-wheel-manylinux-{{ manylinux_version }}
-          archery docker push {{ test_unittests_image }}
+          archery docker push 
${TEST_IMAGE_PREFIX}-wheel-manylinux-test-unittests
       {% endif %}

Reply via email to