simplifying workflow dependencies #17459

Author: behrisch

.github/workflows/cibuildwheel.yml

@@ -144,8 +144,8 @@ jobs:
   # testing wheels
   ###################
   test-wheels:
-    needs: [generate-matrix, pure-python-wheels, build-wheels]
+    needs: [pure-python-wheels, build-wheels]
     uses: ./.github/workflows/test-wheels.yml
     with:
-      matrix: ${{ needs.generate-matrix.outputs.test_matrix }}
+      os: ${{ inputs.os }}
       wheel_source: 'python-wheels'

.github/workflows/linux-wheels.yml

@@ -15,125 +15,9 @@ on:
     paths-ignore:  # but ignore everything in the docs subfolder
       - 'docs/**'
   workflow_dispatch:
-  schedule:
-    - cron:  '5 1 * * *'
-    - cron:  '5 8 * * *'
 
 jobs:
-  build-manylinux-wheels:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Cloning SUMO
-      if: github.event.schedule != '5 8 * * *'
-      uses: actions/checkout@v6
-      with:
-        fetch-depth: 0
-        filter: tree:0
-        # to work around actions/checkout#1467
-        ref: ${{ github.ref }}
-
-    - name: Building sumolib / traci (pure Python) wheels and sdist
-      if: github.event.schedule != '5 8 * * *'
-      run: |
-        cd tools
-        sudo apt-get update
-        sudo apt-get install python3-build
-        python3 build_config/version.py build_config/setup-sumolib.py ./setup.py
-        python3 -m build -o ../wheelhouse
-        python3 build_config/version.py build_config/setup-traci.py ./setup.py
-        python3 -m build -o ../wheelhouse
-
-    - name: Building SUMO / libsumo Python wheels (latest manylinux docker)
-      if: github.event.schedule != '5 8 * * *'
-      uses: docker://quay.io/pypa/manylinux2014_x86_64
-      with:
-        entrypoint: tools/build_config/build_wheels.sh
-
-    # the next two steps are only needed when we debug the manylinux build
-    # - name: Building Python wheels (fixed manylinux docker)
-    #   uses: docker://quay.io/pypa/manylinux2014_x86_64:2022-11-14-1226cfc
-    #   with:
-    #     entrypoint: tools/build_config/build_wheels.sh
-
-    # - name: Uploading raw wheels (without auditwheel being applied)
-    #   uses: actions/upload-artifact@v6
-    #   with:
-    #     name: manylinux-raw-wheels
-    #     path: dist
-
-    - name: Uploading artifacts (Python wheels)
-      if: github.event.schedule != '5 8 * * *'
-      uses: actions/upload-artifact@v6
-      with:
-        name: manylinux-wheels
-        path: wheelhouse
-
-  ###################
-  # testing wheels
-  ###################
-  test-wheels:
-    needs: [build-manylinux-wheels]
-    runs-on: ubuntu-latest
-    env:
-      WHEEL_DIR: manylinux-wheels
-    strategy:
-      fail-fast: false
-      matrix:
-        python_version: [3.8, 3.9, '3.10', 3.11, 3.12, 3.13]
-#        python_version: [3.8, 3.9, '3.10', 3.11, 3.12, 3.13, 3.13t, 3.14]
-
-    steps:
-    - name: Cloning SUMO
-      uses: actions/checkout@v6
-
-    - name: Downloading Wheels artifact
-      if: github.event.schedule != '5 8 * * *'
-      uses: actions/download-artifact@v7
-      with:
-        path: manylinux-wheels
-
-    - name: Setting wheel directory
-      if: github.event.schedule == '5 8 * * *'
-      run: echo 'WHEEL_DIR=https://sumo.dlr.de/daily/wheels' >> $GITHUB_ENV
-
-    - name: Configuring Python
-      uses: actions/setup-python@v6
-      with:
-        python-version: ${{ matrix.python_version }}
-
-    - name: Preparing Python environment
-      run: |
-        sudo apt-get update
-        sudo apt-get install pipx
-        pipx install texttest
-        python3 -m venv testenv --system-site-packages
-        testenv/bin/python -m pip install --no-index -f $WHEEL_DIR eclipse_sumo
-        testenv/bin/python -c "import sumo; print('SUMO_HOME=' + sumo.SUMO_HOME)" >> $GITHUB_ENV
-
-    - name: Running "sumo in the wheel" tests
-      if: matrix.python_version != '3.13t'
-      run: |
-        source testenv/bin/activate
-        python3 -m pip install -r tools/req_ci.txt -r tools/requirements.txt
-        tests/runTests.sh -b ci -v ci.fast
-
-    - name: Running libsumo tests
-      run: |
-        source testenv/bin/activate
-        python3 -m pip install -f $WHEEL_DIR libsumo
-        cd tests
-        texttest -b ci -v ci -a complex.libsumo
-
-    - name: Compressing test results
-      if: failure()
-      run: |
-        zip -r texttesttmp.zip ~/.texttest/tmp
-
-    - name: Uploading test results
-      if: failure()
-      uses: actions/upload-artifact@v6
-      with:
-        name: texttesttmp-${{ matrix.python_version }}
-        path: texttesttmp.zip
-        if-no-files-found: warn
+  call-cibuildwheel:
+    uses: ./.github/workflows/cibuildwheel.yml
+    with:
+      os: "ubuntu-latest,ubuntu-24.04-arm"

.github/workflows/macos-wheels.yml

@@ -15,8 +15,6 @@ on:
     paths-ignore:  # but ignore everything in the docs subfolder
       - 'docs/**'
   workflow_dispatch:
-  schedule:
-    - cron:  '25 2 * * *'
 
 jobs:
   call-cibuildwheel:

.github/workflows/test-wheels.yml

@@ -6,30 +6,34 @@ on:
       - '.github/workflows/test-wheels.yml'
   workflow_call:
     inputs:
-      matrix:
+      os:
         type: string
         required: false
       wheel_source:
         type: string
         required: false
   workflow_dispatch:
     inputs:
+      os:
+        type: string
+        required: false
       wheel_source:
         type: string
         required: false
   schedule:
     - cron:  '5 6 * * *'
 
 jobs:
-  maybe-generate-matrix:
-    if: inputs.matrix == ''
+  generate-matrix:
     uses: ./.github/workflows/generate-matrix.yml
+    with:
+      os: ${{ inputs.os }}
 
   test-wheels:
-    needs: [maybe-generate-matrix]
+    needs: [generate-matrix]
     strategy:
       fail-fast: false
-      matrix: ${{ fromJSON(inputs.matrix || needs.maybe-generate-matrix.outputs.test_matrix) }}
+      matrix: ${{ fromJSON(needs.generate-matrix.outputs.test_matrix) }}
     runs-on: ${{ matrix.os }}
     env:
       WHEEL_SOURCE: ${{ inputs.wheel_source || 'https://sumo.dlr.de/daily/ciwheels' }}