From 81bbb7d5950e4f27058237e454b777dcf69fc9c7 Mon Sep 17 00:00:00 2001 From: Lu Weizheng Date: Wed, 10 Jul 2024 21:50:57 +0800 Subject: [PATCH 1/5] fix macos build error --- .github/workflows/build-wheel.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-wheel.yaml b/.github/workflows/build-wheel.yaml index 16f0ac3c..5b510143 100644 --- a/.github/workflows/build-wheel.yaml +++ b/.github/workflows/build-wheel.yaml @@ -36,14 +36,17 @@ jobs: arch: aarch64 requires-python: ">=3.11,<3.12" - os: macos-latest - arch: arm64 - requires-python: ">=3.9,<3.10" + arch: x86_64 + requires-python: ">=3.8,<3.10" - os: macos-latest - arch: arm64 - requires-python: ">=3.10,<3.11" + arch: x86_64 + requires-python: ">=3.10,<3.12" - os: macos-latest - arch: arm64 - requires-python: ">=3.11,<3.12" + arch: universal2 + requires-python: ">=3.8,<3.10" + - os: macos-latest + arch: universal2 + requires-python: ">=3.10,<3.12" steps: - uses: actions/checkout@v3 From 22955028f87de600154ad6672da7445d63e24105 Mon Sep 17 00:00:00 2001 From: Lu Weizheng Date: Wed, 10 Jul 2024 21:59:11 +0800 Subject: [PATCH 2/5] fix macos build error --- .github/workflows/build-wheel.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-wheel.yaml b/.github/workflows/build-wheel.yaml index 5b510143..38242104 100644 --- a/.github/workflows/build-wheel.yaml +++ b/.github/workflows/build-wheel.yaml @@ -3,7 +3,7 @@ name: Build and upload to PyPI on: schedule: # trigger build every day at 4:30 UTC - - cron: '30 4 * * *' + - cron: '02 14 * * *' push: tags: - '*' From 39ea49639c19464bf73439f8e6d904f3399bccf5 Mon Sep 17 00:00:00 2001 From: Lu Weizheng Date: Wed, 10 Jul 2024 22:51:02 +0800 Subject: [PATCH 3/5] fix macos build error --- .github/workflows/build-wheel.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel.yaml b/.github/workflows/build-wheel.yaml index 38242104..90e4f767 100644 --- a/.github/workflows/build-wheel.yaml +++ b/.github/workflows/build-wheel.yaml @@ -3,7 +3,7 @@ name: Build and upload to PyPI on: schedule: # trigger build every day at 4:30 UTC - - cron: '02 14 * * *' + - cron: '55 14 * * *' push: tags: - '*' @@ -35,16 +35,16 @@ jobs: - os: ubuntu-latest arch: aarch64 requires-python: ">=3.11,<3.12" - - os: macos-latest + - os: macos-12 arch: x86_64 requires-python: ">=3.8,<3.10" - - os: macos-latest + - os: macos-12 arch: x86_64 requires-python: ">=3.10,<3.12" - - os: macos-latest + - os: macos-12 arch: universal2 requires-python: ">=3.8,<3.10" - - os: macos-latest + - os: macos-12 arch: universal2 requires-python: ">=3.10,<3.12" From 5242414e74951f1f92a5eadcf5cbe366d0a7a9a5 Mon Sep 17 00:00:00 2001 From: Lu Weizheng Date: Mon, 29 Jul 2024 14:25:12 +0800 Subject: [PATCH 4/5] workaround runner: macos-latest -> macos-13 --- .github/mergify.yml | 4 ++-- .github/workflows/python.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 64301053..a63c9cfd 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -13,8 +13,8 @@ pull_request_rules: - check-success=build_test_job (ubuntu-latest, 3.9, xoscar) - check-success=build_test_job (ubuntu-latest, 3.10, xoscar) - check-success=build_test_job (ubuntu-latest, 3.11, xoscar) - - check-success=build_test_job (macos-latest, 3.8, xoscar) - - check-success=build_test_job (macos-latest, 3.11, xoscar) + - check-success=build_test_job (macos-13, 3.8, xoscar) + - check-success=build_test_job (macos-13, 3.11, xoscar) - check-success=build_test_job (windows-latest, 3.8, xoscar) - check-success=build_test_job (windows-latest, 3.11, xoscar) - check-success=codecov/project diff --git a/.github/workflows/python.yaml b/.github/workflows/python.yaml index a84b96ca..923957e3 100644 --- a/.github/workflows/python.yaml +++ b/.github/workflows/python.yaml @@ -76,12 +76,12 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu-latest", "macos-latest", "windows-latest"] + os: ["ubuntu-latest", "macos-13", "windows-latest"] python-version: ["3.8", "3.9", "3.10", "3.11"] module: ["xoscar"] exclude: - - { os: macos-latest, python-version: 3.9} - - { os: macos-latest, python-version: 3.10} + - { os: macos-13, python-version: 3.9} + - { os: macos-13, python-version: 3.10} - { os: windows-latest, python-version: 3.9} - { os: windows-latest, python-version: 3.10} include: From 3f3989f87810a3ed9de54b13f17463e0ccecebc2 Mon Sep 17 00:00:00 2001 From: Lu Weizheng Date: Mon, 29 Jul 2024 14:27:29 +0800 Subject: [PATCH 5/5] workaround runner: macos-latest -> macos-13 --- .github/workflows/build-wheel.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-wheel.yaml b/.github/workflows/build-wheel.yaml index 90e4f767..560a407a 100644 --- a/.github/workflows/build-wheel.yaml +++ b/.github/workflows/build-wheel.yaml @@ -3,7 +3,7 @@ name: Build and upload to PyPI on: schedule: # trigger build every day at 4:30 UTC - - cron: '55 14 * * *' + - cron: '30 4 * * *' push: tags: - '*' @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-13, windows-latest] arch: [auto] requires-python: [">=3.8,<3.10", ">=3.10,<3.12"] include: