From 6cfef62c21330672538fd5e9b45ec888569c0a6f Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <michael.crusoe@gmail.com>
Date: Thu, 24 Oct 2024 15:35:55 +0200
Subject: [PATCH] binary wheels: only build on main and other optimizations

- cibuildwheel: adjust pytest parallel execution
- cicircle: upgrade to ubuntu 24.04
- Stop building for musllinux_1_1
  https://github.com/pypa/manylinux/issues/1629
  > musl libc 1.1 is EOL and Alpine Linux 3.12 also (support ended 2 years ago, May 1st, 2022).
---
 .circleci/config.yml         | 15 ++++++---------
 .github/workflows/wheels.yml |  3 ---
 pyproject.toml               |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2127e18be..fce789feb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,8 +15,8 @@ jobs:
         type: string
 
     machine:
-      image: ubuntu-2204:current
-    resource_class: arm.medium  # two vCPUs
+      image: ubuntu-2404:current
+    resource_class: arm.medium  # 2 vCPUs
 
     environment:
       CIBW_ARCHS: "aarch64"
@@ -84,20 +84,17 @@ workflows:
       - arm-wheels:
           name: arm-wheels-manylinux_2_28
           filters:
+            branches:
+              only: main
             tags:
               only: /.*/
           build: "*manylinux*"
           image: quay.io/pypa/manylinux_2_28_aarch64
-      - arm-wheels:
-          name: arm-wheels-musllinux_1_1
-          filters:
-            tags:
-              only: /.*/
-          build: "*musllinux*"
-          image: quay.io/pypa/musllinux_1_1_aarch64
       - arm-wheels:
           name: arm-wheels-musllinux_1_2
           filters:
+            branches:
+              only: main
             tags:
               only: /.*/
           build: "*musllinux*"
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 9c14eb4e7..fb54729d4 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -5,7 +5,6 @@ on:
     types: [published]
   workflow_dispatch: {}
   repository_dispatch: {}
-  pull_request:
   push:
     branches:
       - main
@@ -23,8 +22,6 @@ jobs:
         include:
           - image: manylinux_2_28_x86_64
             build: "*manylinux*"
-          - image: musllinux_1_1_x86_64
-            build: "*musllinux*"
           - image: musllinux_1_2_x86_64
             build: "*musllinux*"
 
diff --git a/pyproject.toml b/pyproject.toml
index a69720739..cec96b76b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ build-backend = "setuptools.build_meta"
 write_to = "cwltool/_version.py"
 
 [tool.cibuildwheel]
-test-command = "python -m pytest -n 2 --junitxml={project}/test-results/junit_$(python -V | awk '{print $2}')_${AUDITWHEEL_PLAT}.xml -k 'not (test_bioconda or test_env_filtering or test_udocker)' --pyargs cwltool"
+test-command = "python -m pytest --ignore cwltool/schemas -n logical --dist worksteal --junitxml={project}/test-results/junit_$(python -V | awk '{print $2}')_${AUDITWHEEL_PLAT}.xml -k 'not (test_bioconda or test_env_filtering or test_udocker)' --pyargs cwltool"
 test-requires = "-r test-requirements.txt"
 test-extras = "deps"
 skip = "pp*"