From 9ef4b48bc53f3ad905a1019a7835863c6031b9c1 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Thu, 21 Nov 2024 12:19:48 -0700 Subject: [PATCH] Added testing for macos-14 --- .github/workflows/ci.yml | 17 +++++++++++++++++ .github/workflows/templates/generate.py | 3 +++ .github/workflows/test-macos.yml | 4 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f57936..fab937b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,6 +146,22 @@ jobs: instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]' + macos-14: + name: macOS 14 + if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' + uses: ./.github/workflows/test-macos.yml + needs: + - lint + - generate-actions-workflow + with: + distro-slug: macos-14 + display-name: macOS 14 + container-slug: macOS 14 + timeout: 20 + runs-on: macos-14 + instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]' + + windows-2022: name: Windows 2022 @@ -234,6 +250,7 @@ jobs: - generate-actions-workflow - macos-12 - macos-13 + - macos-14 - windows-2022 - photon-5 - rockylinux-8 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 15b3861..8a312c5 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -31,6 +31,7 @@ WINDOWS = [ OSX = [ "macos-12", "macos-13", + "macos-14", ] # only test against current containers with systemd @@ -208,6 +209,7 @@ DISTRO_DISPLAY_NAMES = { "ubuntu-2404": "Ubuntu 24.04", "macos-12": "macOS 12", "macos-13": "macOS 13", + "macos-14": "macOS 14", "windows-2022": "Windows 2022", } @@ -227,6 +229,7 @@ CONTAINER_SLUG_NAMES = { "ubuntu-2404": "systemd-ubuntu-24.04", "macos-12": "macos-12", "macos-13": "macos-13", + "macos-14": "macOS 14", "windows-2022": "windows-2022", } diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index 2779cf1..d59bb5f 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -36,8 +36,8 @@ on: jobs: Test: name: ${{ matrix.instance }} - ## runs-on: ${{ inputs.runs-on }} - runs-on: macos-13 + runs-on: ${{ inputs.runs-on }} + ## runs-on: macos-13 timeout-minutes: ${{ inputs.timeout }} strategy: fail-fast: false