From 8a8eddea6b7dd9b0adf27d1b6d5db872b373d33b Mon Sep 17 00:00:00 2001 From: Edoardo Altamura <38359901+edoaltamura@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:51:53 +0200 Subject: [PATCH 1/4] Remove redundant MacOS 14 image --- .github/workflows/main.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 554446087..f07a5c671 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -122,11 +122,6 @@ jobs: python-version: 3.9 - os: windows-latest python-version: 3.12 - # macos-14 is an Arm64 image - - os: macos-14 - python-version: '3.10' - - os: macos-14 - python-version: 3.12 steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -302,20 +297,12 @@ jobs: with: name: windows-latest-3.12 path: /tmp/w312 - - uses: actions/download-artifact@v4 - with: - name: macos-14-3.10 - path: /tmp/a310 - - uses: actions/download-artifact@v4 - with: - name: macos-14-3.12 - path: /tmp/a312 - name: Install Dependencies run: pip install -U coverage coveralls diff-cover shell: bash - name: Combined Deprecation Messages run: | - sort -f -u /tmp/u39/ml.dep /tmp/u310/ml.dep /tmp/u311/ml.dep /tmp/u312/ml.dep /tmp/m39/ml.dep /tmp/m312/ml.dep /tmp/w39/ml.dep /tmp/w312/ml.dep /tmp/a310/ml.dep /tmp/a312/ml.dep || true + sort -f -u /tmp/u39/ml.dep /tmp/u310/ml.dep /tmp/u311/ml.dep /tmp/u312/ml.dep /tmp/m39/ml.dep /tmp/m312/ml.dep /tmp/w39/ml.dep /tmp/w312/ml.dep || true shell: bash - name: Coverage combine run: coverage3 combine /tmp/u39/ml.dat From 14f945e3f0c8eaf39195fed81bc6e55ce077735f Mon Sep 17 00:00:00 2001 From: Edoardo Altamura <38359901+edoaltamura@users.noreply.github.com> Date: Fri, 18 Oct 2024 17:59:08 +0200 Subject: [PATCH 2/4] Update with macos-latest-large --- .github/workflows/main.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f07a5c671..9fecfce3a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -114,6 +114,7 @@ jobs: os: [ubuntu-latest] python-version: [3.9, '3.10', 3.11, 3.12] include: + # macos-latest is an Arm64 image - os: macos-latest python-version: 3.9 - os: macos-latest @@ -122,6 +123,11 @@ jobs: python-version: 3.9 - os: windows-latest python-version: 3.12 + # macos-latest-large is an X86 image + - os: macos-latest-large + python-version: 3.9 + - os: macos-latest-large + python-version: 3.12 steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -297,12 +303,20 @@ jobs: with: name: windows-latest-3.12 path: /tmp/w312 + - uses: actions/download-artifact@v4 + with: + name: macos-latest-large-3.9 + path: /tmp/x39 + - uses: actions/download-artifact@v4 + with: + name: macos-latest-large-3.12 + path: /tmp/x312 - name: Install Dependencies run: pip install -U coverage coveralls diff-cover shell: bash - name: Combined Deprecation Messages run: | - sort -f -u /tmp/u39/ml.dep /tmp/u310/ml.dep /tmp/u311/ml.dep /tmp/u312/ml.dep /tmp/m39/ml.dep /tmp/m312/ml.dep /tmp/w39/ml.dep /tmp/w312/ml.dep || true + sort -f -u /tmp/u39/ml.dep /tmp/u310/ml.dep /tmp/u311/ml.dep /tmp/u312/ml.dep /tmp/m39/ml.dep /tmp/m312/ml.dep /tmp/w39/ml.dep /tmp/w312/ml.dep /tmp/x39/ml.dep /tmp/x312/ml.dep || true shell: bash - name: Coverage combine run: coverage3 combine /tmp/u39/ml.dat From eba195dd7fbadd4bba45401e55190a3d3d7c3394 Mon Sep 17 00:00:00 2001 From: Edoardo Altamura <38359901+edoaltamura@users.noreply.github.com> Date: Fri, 18 Oct 2024 20:26:18 +0200 Subject: [PATCH 3/4] Revert "Update with macos-latest-large" This reverts commit 14f945e3f0c8eaf39195fed81bc6e55ce077735f. --- .github/workflows/main.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9fecfce3a..f07a5c671 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -114,7 +114,6 @@ jobs: os: [ubuntu-latest] python-version: [3.9, '3.10', 3.11, 3.12] include: - # macos-latest is an Arm64 image - os: macos-latest python-version: 3.9 - os: macos-latest @@ -123,11 +122,6 @@ jobs: python-version: 3.9 - os: windows-latest python-version: 3.12 - # macos-latest-large is an X86 image - - os: macos-latest-large - python-version: 3.9 - - os: macos-latest-large - python-version: 3.12 steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -303,20 +297,12 @@ jobs: with: name: windows-latest-3.12 path: /tmp/w312 - - uses: actions/download-artifact@v4 - with: - name: macos-latest-large-3.9 - path: /tmp/x39 - - uses: actions/download-artifact@v4 - with: - name: macos-latest-large-3.12 - path: /tmp/x312 - name: Install Dependencies run: pip install -U coverage coveralls diff-cover shell: bash - name: Combined Deprecation Messages run: | - sort -f -u /tmp/u39/ml.dep /tmp/u310/ml.dep /tmp/u311/ml.dep /tmp/u312/ml.dep /tmp/m39/ml.dep /tmp/m312/ml.dep /tmp/w39/ml.dep /tmp/w312/ml.dep /tmp/x39/ml.dep /tmp/x312/ml.dep || true + sort -f -u /tmp/u39/ml.dep /tmp/u310/ml.dep /tmp/u311/ml.dep /tmp/u312/ml.dep /tmp/m39/ml.dep /tmp/m312/ml.dep /tmp/w39/ml.dep /tmp/w312/ml.dep || true shell: bash - name: Coverage combine run: coverage3 combine /tmp/u39/ml.dat From 6f57424f06de85f215611177030abb245959cd94 Mon Sep 17 00:00:00 2001 From: Edoardo Altamura <38359901+edoaltamura@users.noreply.github.com> Date: Fri, 18 Oct 2024 20:27:38 +0200 Subject: [PATCH 4/4] Update with macos-latest-large --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f07a5c671..1e3eeb01f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -114,6 +114,7 @@ jobs: os: [ubuntu-latest] python-version: [3.9, '3.10', 3.11, 3.12] include: + # macos-latest is an Arm64 image - os: macos-latest python-version: 3.9 - os: macos-latest