From 4a08d165dbf3229a7bfe200138bff549c9a32713 Mon Sep 17 00:00:00 2001 From: Alex Lowe Date: Tue, 6 Feb 2024 21:17:11 -0500 Subject: [PATCH] ci: update macos runners Following the GitHub runner roadmap: https://github.com/actions/runner-images/issues/9255 fixes #1508 --- .github/workflows/tests.yaml | 2 +- tests/integration/commands/test_init.py | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 63bffada5..7e19162a3 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -47,7 +47,7 @@ jobs: run-tests: strategy: matrix: - os: [ubuntu-22.04, macos-11, macos-12, windows-2019, windows-2022] + os: [ubuntu-22.04, macos-12, macos-13, macos-14-arm64, windows-2019, windows-2022] runs-on: ${{ matrix.os }} steps: - name: Checkout code diff --git a/tests/integration/commands/test_init.py b/tests/integration/commands/test_init.py index 21ec338a5..628b661da 100644 --- a/tests/integration/commands/test_init.py +++ b/tests/integration/commands/test_init.py @@ -18,7 +18,6 @@ import contextlib import os import pathlib -import platform import re import shutil import subprocess @@ -222,10 +221,6 @@ def test_executable_set(new_path, init_command): @pytest.mark.slow() @pytest.mark.skipif(sys.platform == "win32", reason="does not run on windows") -@pytest.mark.xfail( - platform.system() == "Darwin" and platform.platform().startswith("macOS-11."), - reason="Currently failing on macos 11, see https://github.com/canonical/charmcraft/issues/1508", -) @pytest.mark.skipif(bool(os.getenv("RUNNING_TOX")), reason="does not work inside tox") @pytest.mark.parametrize("profile", list(commands.init.PROFILES)) def test_tox_success(new_path, init_command, profile):