no-issue: Use the official term "free-threading" for GitHub Action (p…

…ythongh-113622)
corona10 · Jan 2, 2024 · 1c5f482 · 1c5f482
1 parent 44eb329
commit 1c5f482
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -225,6 +225,15 @@ jobs:
     with:
       config_hash: ${{ needs.check_source.outputs.config_hash }}
 
+  build_macos_free_threading:
+    name: 'macOS (free-threading)'
+    needs: check_source
+    if: needs.check_source.outputs.run_tests == 'true'
+    uses: ./.github/workflows/reusable-macos.yml
+    with:
+      config_hash: ${{ needs.check_source.outputs.config_hash }}
+      free-threading: true
+
   build_ubuntu:
     name: 'Ubuntu'
     needs: check_source
@@ -238,6 +247,23 @@ jobs:
           --with-pydebug \
           --with-openssl=$OPENSSL_DIR
 
+<<<<<<< HEAD
+=======
+  build_ubuntu_free_threading:
+    name: 'Ubuntu (free-threading)'
+    needs: check_source
+    if: needs.check_source.outputs.run_tests == 'true'
+    uses: ./.github/workflows/reusable-ubuntu.yml
+    with:
+      config_hash: ${{ needs.check_source.outputs.config_hash }}
+      options: |
+        ../cpython-ro-srcdir/configure \
+          --config-cache \
+          --with-pydebug \
+          --with-openssl=$OPENSSL_DIR \
+          --disable-gil
+
+>>>>>>> 3aadb95085 (no-issue: Use the official term "free-threading" for GitHub Action (gh-113622))
   build_ubuntu_ssltests:
     name: 'Ubuntu SSL tests with OpenSSL'
     runs-on: ubuntu-20.04
@@ -463,9 +489,18 @@ jobs:
     - check-docs
     - check_generated_files
     - build_macos
+<<<<<<< HEAD
     - build_ubuntu
     - build_ubuntu_ssltests
     - build_windows
+=======
+    - build_macos_free_threading
+    - build_ubuntu
+    - build_ubuntu_free_threading
+    - build_ubuntu_ssltests
+    - build_windows
+    - build_windows_free_threading
+>>>>>>> 3aadb95085 (no-issue: Use the official term "free-threading" for GitHub Action (gh-113622))
     - test_hypothesis
     - build_asan
 
@@ -492,9 +527,18 @@ jobs:
             && '
             check_generated_files,
             build_macos,
+<<<<<<< HEAD
+            build_ubuntu,
+            build_ubuntu_ssltests,
+            build_windows,
+=======
+            build_macos_free_threading,
             build_ubuntu,
+            build_ubuntu_free_threading,
             build_ubuntu_ssltests,
             build_windows,
+            build_windows_free_threading,
+>>>>>>> 3aadb95085 (no-issue: Use the official term "free-threading" for GitHub Action (gh-113622))
             build_asan,
             '
             || ''

diff --git a/.github/workflows/reusable-macos.yml b/.github/workflows/reusable-macos.yml
@@ -4,7 +4,7 @@ on:
       config_hash:
         required: true
         type: string
-      free-threaded:
+      free-threading:
         required: false
         type: boolean
         default: false
@@ -35,7 +35,7 @@ jobs:
         ./configure \
           --config-cache \
           --with-pydebug \
-          ${{ inputs.free-threaded && '--disable-gil' || '' }} \
+          ${{ inputs.free-threading && '--disable-gil' || '' }} \
           --prefix=/opt/python-dev \
           --with-openssl="$(brew --prefix [email protected])"
     - name: Build CPython

diff --git a/.github/workflows/reusable-windows.yml b/.github/workflows/reusable-windows.yml
@@ -1,7 +1,7 @@
 on:
   workflow_call:
     inputs:
-      free-threaded:
+      free-threading:
         required: false
         type: boolean
         default: false
@@ -16,7 +16,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Build CPython
-      run: .\PCbuild\build.bat -e -d -p Win32 ${{ inputs.free-threaded && '--disable-gil' || '' }}
+      run: .\PCbuild\build.bat -e -d -p Win32 ${{ inputs.free-threading && '--disable-gil' || '' }}
     - name: Display build info
       run: .\python.bat -m test.pythoninfo
     - name: Tests
@@ -33,7 +33,7 @@ jobs:
     - name: Register MSVC problem matcher
       run: echo "::add-matcher::.github/problem-matchers/msvc.json"
     - name: Build CPython
-      run: .\PCbuild\build.bat -e -d -p x64 ${{ inputs.free-threaded && '--disable-gil' || '' }}
+      run: .\PCbuild\build.bat -e -d -p x64 ${{ inputs.free-threading && '--disable-gil' || '' }}
     - name: Display build info
       run: .\python.bat -m test.pythoninfo
     - name: Tests
@@ -50,4 +50,4 @@ jobs:
     - name: Register MSVC problem matcher
       run: echo "::add-matcher::.github/problem-matchers/msvc.json"
     - name: Build CPython
-      run: .\PCbuild\build.bat -e -d -p arm64 ${{ inputs.free-threaded && '--disable-gil' || '' }}
+      run: .\PCbuild\build.bat -e -d -p arm64 ${{ inputs.free-threading && '--disable-gil' || '' }}