From 3356f15f6de5651f2d3333a58881d960b6be650e Mon Sep 17 00:00:00 2001 From: StarHeart Date: Fri, 26 Apr 2024 10:41:10 +0800 Subject: [PATCH 1/5] :construction_worker: fix ci --- .github/workflows/codecov.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 3d8ce58861e3..6aa18f49aa52 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -27,6 +27,12 @@ jobs: python-version: ["3.9", "3.10", "3.11", "3.12"] os: [ubuntu-latest, windows-latest, macos-latest] env: [pydantic-v1, pydantic-v2] + exclude: + - python-version: "3.9" + os: macos-latest + include: + - python-version: "3.9" + os: macos-13 fail-fast: false env: OS: ${{ matrix.os }} From c82943da202ed36cd8ec2291b6221d85a43e89df Mon Sep 17 00:00:00 2001 From: StarHeartHunt Date: Fri, 26 Apr 2024 10:45:43 +0800 Subject: [PATCH 2/5] :construction_worker: remove arch limits and let setup-python decide --- .github/actions/setup-python/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/setup-python/action.yml b/.github/actions/setup-python/action.yml index 26ce291d7cbd..98f29314b9d2 100644 --- a/.github/actions/setup-python/action.yml +++ b/.github/actions/setup-python/action.yml @@ -25,7 +25,6 @@ runs: - uses: actions/setup-python@v5 with: python-version: ${{ inputs.python-version }} - architecture: "x64" cache: "poetry" cache-dependency-path: | ./poetry.lock From 6ea65588b196d6797bcd72cd91ddbd8217494a57 Mon Sep 17 00:00:00 2001 From: StarHeartHunt Date: Fri, 26 Apr 2024 10:52:50 +0800 Subject: [PATCH 3/5] :construction_worker: fix --- .github/workflows/codecov.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 6aa18f49aa52..55ec85cb194f 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -30,9 +30,11 @@ jobs: exclude: - python-version: "3.9" os: macos-latest + env: [pydantic-v1, pydantic-v2] include: - python-version: "3.9" os: macos-13 + env: [pydantic-v1, pydantic-v2] fail-fast: false env: OS: ${{ matrix.os }} From e7b8d8af29f4997a800c5bc0b4cdb0085a4f9085 Mon Sep 17 00:00:00 2001 From: StarHeartHunt Date: Fri, 26 Apr 2024 10:55:26 +0800 Subject: [PATCH 4/5] :construction_worker: fix --- .github/workflows/codecov.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 55ec85cb194f..d6474743aa31 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -23,6 +23,7 @@ jobs: group: test-coverage-${{ github.ref }}-${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.env }} cancel-in-progress: true strategy: + fail-fast: false matrix: python-version: ["3.9", "3.10", "3.11", "3.12"] os: [ubuntu-latest, windows-latest, macos-latest] @@ -30,12 +31,17 @@ jobs: exclude: - python-version: "3.9" os: macos-latest - env: [pydantic-v1, pydantic-v2] + env: pydantic-v1 + - python-version: "3.9" + os: macos-latest + env: pydantic-v2 include: - python-version: "3.9" os: macos-13 - env: [pydantic-v1, pydantic-v2] - fail-fast: false + env: pydantic-v1 + - python-version: "3.9" + os: macos-13 + env: pydantic-v2 env: OS: ${{ matrix.os }} PYTHON_VERSION: ${{ matrix.python-version }} From 6181fcee30ad340346169563fec408adbe6750a2 Mon Sep 17 00:00:00 2001 From: StarHeartHunt Date: Fri, 26 Apr 2024 11:04:43 +0800 Subject: [PATCH 5/5] :construction_worker: update --- .github/workflows/codecov.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index d6474743aa31..491d609a2d8f 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -28,20 +28,6 @@ jobs: python-version: ["3.9", "3.10", "3.11", "3.12"] os: [ubuntu-latest, windows-latest, macos-latest] env: [pydantic-v1, pydantic-v2] - exclude: - - python-version: "3.9" - os: macos-latest - env: pydantic-v1 - - python-version: "3.9" - os: macos-latest - env: pydantic-v2 - include: - - python-version: "3.9" - os: macos-13 - env: pydantic-v1 - - python-version: "3.9" - os: macos-13 - env: pydantic-v2 env: OS: ${{ matrix.os }} PYTHON_VERSION: ${{ matrix.python-version }}