CinderX OSS CI Improvements

Summary:
Merge buildwheels.yml into ci.yml.  All CI jobs will now run on pull requests
and on pushed commits.  CI amounts to:

* Run tests w/ pytest
* Ensure binary wheels can be built
* Ensure a source distribution can be built

Some of cibuildwheel's configuration is now moved to pyproject.toml to dedupe
things across tests and the weekly release flow.

The Python version is now specified as a matrix variable.  This will make it
easier to test with multiple versions in the future.

Deleted the explicit *X86_64_IMAGE environment variables.  They're not doing
anything, the values they're set to are already the defaults.

Updated the versions of common actions.

Reviewed By: yoney

Differential Revision: D93918631

fbshipit-source-id: a34b3cb9a8e6c0b8366dac5577ef5daacd262355

Author: alexmalyshev

.github/workflows/buildwheels.yml

@@ -1,40 +1,84 @@
-name: CinderX
+name: CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
-  test:
-    runs-on: ubuntu-latest
+  run_tests:
+    name: Run Tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        python-version: ['3.14.3']
 
     steps:
     - name: Checkout CinderX
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
-        python-version: 3.14.3
+        python-version: ${{ matrix.python-version }}
 
     - name: Set up uv
       uses: astral-sh/setup-uv@v7
 
     - name: Create venv
-      run: uv venv --python 3.14.3
+      run: uv venv --python ${{ matrix.python-version }}
 
     - name: Build CinderX
-      run: uv build --wheel --python 3.14.3
+      run: uv build --wheel --python ${{ matrix.python-version }}
 
     - name: Install CinderX
       run: uv pip install dist/*.whl
 
-    - name: Check CinderX Imports
+    - name: Check CinderX loads successfully
       run: |
         uv run python -c 'import cinderx ; print(cinderx.get_import_error()) ; assert cinderx.is_initialized()'
 
     - name: Install Pytest
-      run: |
-        uv pip install pytest
+      run: uv pip install pytest
 
     - name: Run Tests
-      run: |
-        uv run pytest cinderx/PythonLib/test_cinderx/test*.py
+      run: uv run pytest cinderx/PythonLib/test_cinderx/test*.py
+
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v6
+
+      # cibuildwheel uses a docker container so the Python version is irrelevant
+      # here.
+      - uses: actions/setup-python@v6
+
+      - name: Install cibuildwheel
+        run: python -m pip install cibuildwheel
+
+      - name: Build wheels
+        run: python -m cibuildwheel --output-dir wheelhouse
+
+  build_sdist:
+    name: Build source distribution
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        python-version: ['3.14.3']
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install build tools
+        run: python -m pip install build
+
+      - name: Build sdist
+        run: python -m build --sdist

.github/workflows/ci.yml

@@ -23,39 +23,39 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.14.3'
+      # cibuildwheel uses a docker container so the Python version is irrelevant
+      # here.
+      - uses: actions/setup-python@v6
 
       - name: Install cibuildwheel
         run: python -m pip install cibuildwheel
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
         env:
-          CIBW_BUILD: cp314-manylinux_x86_64 cp314-musllinux_x86_64
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
-          CIBW_MUSLLINUX_X86_64_IMAGE: musllinux_1_2
-          CIBW_ENVIRONMENT: CINDERX_ENABLE_PGO=1 CINDERX_ENABLE_LTO=1 CINDERX_VERSION_PATCH=${{ inputs.patch_version || '0' }}
-          CIBW_BUILD_VERBOSITY: 3
+          CINDERX_VERSION_PATCH: ${{ inputs.patch_version || '0' }}
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
     name: Build source distribution
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        python-version: ['3.14.3']
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.14.3'
+          python-version: ${{ matrix.python-version }}
 
       - name: Install build tools
         run: python -m pip install build
@@ -65,7 +65,7 @@ jobs:
         env:
           CINDERX_VERSION_PATCH: ${{ inputs.patch_version || '0' }}
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: cibw-sdist
           path: dist/*.tar.gz
@@ -80,7 +80,7 @@ jobs:
 
     steps:
       - name: Download all artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           pattern: cibw-*
           path: dist

.github/workflows/publish.yml

@@ -22,3 +22,13 @@ classifiers = [
 
 [project.urls]
 Repository = "https://www.github.com/facebookincubator/cinderx"
+
+[tool.cibuildwheel]
+build = ["cp314-manylinux_x86_64", "cp314-musllinux_x86_64"]
+environment = { CINDERX_ENABLE_PGO = "1", CINDERX_ENABLE_LTO = "1" }
+build-verbosity = 3
+
+[tool.cibuildwheel.linux]
+# If it exists, pass through CINDERX_VERSION_PATCH to setuptools to specify the
+# patch version.
+environment-pass = ["CINDERX_VERSION_PATCH"]