From e001250f7ae342a628801819647b32e9fac4f45c Mon Sep 17 00:00:00 2001 From: smheidrich Date: Wed, 8 Jan 2025 02:16:52 +0100 Subject: [PATCH 1/3] Pin OS versions in test CI --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e0810d1..ea08afa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,17 +18,17 @@ jobs: strategy: matrix: python-version: ["3.7"] - os: ["ubuntu-latest", "windows-latest", "macos-latest"] + os: [ubuntu-20.04, windows-2019, macos-11] include: # set OS-specific cache paths - - os: ubuntu-latest + - os: ubuntu-20.04 path: ~/.cache/pip - - os: windows-latest + - os: windows-2019 path: ~\AppData\Local\pip\Cache - - os: macos-latest + - os: macos-11 path: ~/Library/Caches/pip # more combinations: - - os: ubuntu-latest + - os: ubuntu-20.04 python-version: "pypy3.9" path: ~/.cache/pip steps: From a8208c7e8350aa07e640bd09825bd8f55eccbb64 Mon Sep 17 00:00:00 2001 From: smheidrich Date: Wed, 8 Jan 2025 02:32:47 +0100 Subject: [PATCH 2/3] Invalidate CI test caches --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ea08afa..1ec7146 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,14 +46,14 @@ jobs: ~/.cargo/registry/cache/ ~/.cargo/git/db/ target/ - key: ${{ runner.os }}-rust-v3-${{ hashFiles('**/Cargo.lock') }} + key: ${{ runner.os }}-rust-v4-${{ hashFiles('**/Cargo.lock') }} - name: Restore Python/pip cache uses: actions/cache/restore@v3 with: path: ${{ matrix.path }} - key: ${{ runner.os }}-python-v2-${{ hashFiles('**/requirements.txt') }} + key: ${{ runner.os }}-python-v3-${{ hashFiles('**/requirements.txt') }} restore-keys: | - ${{ runner.os }}-python-v2- + ${{ runner.os }}-python-v3- - name: Install dependencies run: | python -m pip install --upgrade pip @@ -77,10 +77,10 @@ jobs: ~/.cargo/registry/cache/ ~/.cargo/git/db/ target/ - key: ${{ runner.os }}-rust-v3-${{ hashFiles('**/Cargo.lock') }} + key: ${{ runner.os }}-rust-v4-${{ hashFiles('**/Cargo.lock') }} - name: Save Python/pip cache uses: actions/cache/save@v3 if: always() with: path: ${{ matrix.path }} - key: ${{ runner.os }}-python-v2-${{ hashFiles('**/requirements.txt') }} + key: ${{ runner.os }}-python-v3-${{ hashFiles('**/requirements.txt') }} From 5d5a75217402a6292c3c4df50bfbb05aa1f4cf5b Mon Sep 17 00:00:00 2001 From: smheidrich Date: Wed, 8 Jan 2025 02:51:37 +0100 Subject: [PATCH 3/3] Update CI to use macOS 13 --- .github/workflows/build.yml | 2 +- .github/workflows/test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ade069..4d3f8c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019, macos-11] + os: [ubuntu-20.04, windows-2019, macos-13] cibw-build-prefix: ['*'] include: - os: ubuntu-20.04 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1ec7146..1491661 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,14 +18,14 @@ jobs: strategy: matrix: python-version: ["3.7"] - os: [ubuntu-20.04, windows-2019, macos-11] + os: [ubuntu-20.04, windows-2019, macos-13] include: # set OS-specific cache paths - os: ubuntu-20.04 path: ~/.cache/pip - os: windows-2019 path: ~\AppData\Local\pip\Cache - - os: macos-11 + - os: macos-13 path: ~/Library/Caches/pip # more combinations: - os: ubuntu-20.04