From 15a626bc06d82330c057f499d3c772df8f80c817 Mon Sep 17 00:00:00 2001 From: Maciej Lech Date: Thu, 13 Nov 2025 15:14:51 +0100 Subject: [PATCH] Do not use deprecated macos-13 runner in CI --- .github/workflows/cd.yml | 4 ++-- .github/workflows/ci.yml | 16 +++++----------- .../+macos-13-deprecated.infrastructure.md | 1 + 3 files changed, 8 insertions(+), 13 deletions(-) create mode 100644 changelog.d/+macos-13-deprecated.infrastructure.md diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 6b62a30ed..341585034 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -2,7 +2,7 @@ name: Continuous Delivery on: push: - tags: 'v*' # push events to matching v*, i.e. v1.0, v20.15.10 + tags: ['v*'] # push events to matching v*, i.e. v1.0, v20.15.10 env: PYTHON_DEFAULT_VERSION: "3.12" @@ -23,7 +23,7 @@ jobs: with: fetch-depth: 0 - name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }} - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ env.PYTHON_DEFAULT_VERSION }} - name: Display Python version diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee4963923..02134fdb3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: with: ignore_words_list: datas re-use - name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }} - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ env.PYTHON_DEFAULT_VERSION }} cache: "pip" @@ -44,7 +44,7 @@ jobs: with: fetch-depth: 0 - name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }} - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ env.PYTHON_DEFAULT_VERSION }} cache: "pip" @@ -66,7 +66,7 @@ jobs: fetch-depth: 0 - name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }} if: ${{ env.B2_TEST_APPLICATION_KEY != '' && env.B2_TEST_APPLICATION_KEY_ID != '' }} # TODO: skip this whole job instead - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ env.PYTHON_DEFAULT_VERSION }} cache: "pip" @@ -95,22 +95,16 @@ jobs: python-version: "pypy3.10" - os: "windows-latest" python-version: "pypy3.10" - # Workaround for https://github.com/actions/setup-python/issues/696 - - os: "macos-latest" - python-version: 3.9 include: - python-version: "3.12" extras: "full" os: "ubuntu-latest" - # Workaround for https://github.com/actions/setup-python/issues/696 - - os: "macos-13" - python-version: 3.9 steps: - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} cache: "pip" @@ -130,7 +124,7 @@ jobs: with: fetch-depth: 0 - name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }} - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ env.PYTHON_DEFAULT_VERSION }} cache: "pip" diff --git a/changelog.d/+macos-13-deprecated.infrastructure.md b/changelog.d/+macos-13-deprecated.infrastructure.md new file mode 100644 index 000000000..9bbece518 --- /dev/null +++ b/changelog.d/+macos-13-deprecated.infrastructure.md @@ -0,0 +1 @@ +Update CI to not use deprecated `macos-13` runner.