From 51c0b5db9d36e1058d440b8c78bb232fea7f3894 Mon Sep 17 00:00:00 2001 From: Florian Becker Date: Thu, 14 Nov 2024 12:56:37 +0100 Subject: [PATCH] Fix workflow for mac --- .github/workflows/macos-codeql.yml | 34 +++++++++--------------------- .github/workflows/macos.yml | 34 +++++++++--------------------- 2 files changed, 20 insertions(+), 48 deletions(-) diff --git a/.github/workflows/macos-codeql.yml b/.github/workflows/macos-codeql.yml index 938cf5e..fc16439 100644 --- a/.github/workflows/macos-codeql.yml +++ b/.github/workflows/macos-codeql.yml @@ -15,10 +15,8 @@ jobs: fail-fast: false matrix: name: [ - macos-12-xcode-13-x86_64, - macos-12-xcode-13-arm64, - macos-12-xcode-14-x86_64, - macos-12-xcode-14-arm64, + macos-13-xcode-14-x86_64, + macos-13-xcode-14-arm64, macos-13-xcode-15-x86_64, macos-13-xcode-15-arm64, macos-14-xcode-16-x86_64, @@ -26,28 +24,16 @@ jobs: ] config: [Debug, Release] include: - - name: macos-12-xcode-13-x86_64 - os: macos-12 - compiler: xcode - version: "13.4" - architecture: x86_64 - - - name: macos-12-xcode-13-arm64 - os: macos-12 - compiler: xcode - version: "13.4" - architecture: arm64 - - - name: macos-12-xcode-14-x86_64 - os: macos-12 + - name: macos-13-xcode-15-x86_64 + os: macos-13 compiler: xcode - version: "14.2" + version: "14.3" architecture: x86_64 - - name: macos-12-xcode-14-arm64 - os: macos-12 + - name: macos-13-xcode-15-arm64 + os: macos-13 compiler: xcode - version: "14.2" + version: "14.3" architecture: arm64 - name: macos-13-xcode-15-x86_64 @@ -65,13 +51,13 @@ jobs: - name: macos-14-xcode-16-x86_64 os: macos-14 compiler: xcode - version: "16.1" + version: "15.4" architecture: x86_64 - name: macos-14-xcode-16-arm64 os: macos-14 compiler: xcode - version: "16.1" + version: "15.4" architecture: arm64 steps: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d3e7ffd..009d2e7 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -15,10 +15,8 @@ jobs: fail-fast: false matrix: name: [ - macos-12-xcode-13-x86_64, - macos-12-xcode-13-arm64, - macos-12-xcode-14-x86_64, - macos-12-xcode-14-arm64, + macos-13-xcode-14-x86_64, + macos-13-xcode-14-arm64, macos-13-xcode-15-x86_64, macos-13-xcode-15-arm64, macos-14-xcode-16-x86_64, @@ -26,28 +24,16 @@ jobs: ] config: [Debug, Release] include: - - name: macos-12-xcode-13-x86_64 - os: macos-12 - compiler: xcode - version: "13.4" - architecture: x86_64 - - - name: macos-12-xcode-13-arm64 - os: macos-12 - compiler: xcode - version: "13.4" - architecture: arm64 - - - name: macos-12-xcode-14-x86_64 - os: macos-12 + - name: macos-13-xcode-14-x86_64 + os: macos-13 compiler: xcode - version: "14.2" + version: "14.3" architecture: x86_64 - - name: macos-12-xcode-14-arm64 - os: macos-12 + - name: macos-13-xcode-14-arm64 + os: macos-13 compiler: xcode - version: "14.2" + version: "14.3" architecture: arm64 - name: macos-13-xcode-15-x86_64 @@ -65,13 +51,13 @@ jobs: - name: macos-14-xcode-16-x86_64 os: macos-14 compiler: xcode - version: "16.1" + version: "15.4" architecture: x86_64 - name: macos-14-xcode-16-arm64 os: macos-14 compiler: xcode - version: "16.1" + version: "15.4" architecture: arm64 steps: