Skip to content

Commit 4a08d16

Browse files
committed
ci: update macos runners
Following the GitHub runner roadmap: actions/runner-images#9255 fixes #1508
1 parent 560436f commit 4a08d16

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

.github/workflows/tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
run-tests:
4848
strategy:
4949
matrix:
50-
os: [ubuntu-22.04, macos-11, macos-12, windows-2019, windows-2022]
50+
os: [ubuntu-22.04, macos-12, macos-13, macos-14-arm64, windows-2019, windows-2022]
5151
runs-on: ${{ matrix.os }}
5252
steps:
5353
- name: Checkout code

tests/integration/commands/test_init.py

-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import contextlib
1919
import os
2020
import pathlib
21-
import platform
2221
import re
2322
import shutil
2423
import subprocess
@@ -222,10 +221,6 @@ def test_executable_set(new_path, init_command):
222221

223222
@pytest.mark.slow()
224223
@pytest.mark.skipif(sys.platform == "win32", reason="does not run on windows")
225-
@pytest.mark.xfail(
226-
platform.system() == "Darwin" and platform.platform().startswith("macOS-11."),
227-
reason="Currently failing on macos 11, see https://github.com/canonical/charmcraft/issues/1508",
228-
)
229224
@pytest.mark.skipif(bool(os.getenv("RUNNING_TOX")), reason="does not work inside tox")
230225
@pytest.mark.parametrize("profile", list(commands.init.PROFILES))
231226
def test_tox_success(new_path, init_command, profile):

0 commit comments

Comments
 (0)