From 59a3b7c636247cac3349d3b0d1a25892b66071d2 Mon Sep 17 00:00:00 2001 From: Archie Jaskowicz Date: Thu, 18 Jul 2024 23:55:03 +0100 Subject: [PATCH] ci: Added a clang++15 osx job, fixed clang++14 job. (#1204) --- .github/workflows/ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e0a46360e..32944bb164 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,7 +70,7 @@ jobs: - name: Setup mold if: ${{ matrix.cfg.mold == 'yes' }} - uses: rui314/setup-mold@2e332a0b602c2fc65d2d3995941b1b29a5f554a0 + uses: rui314/setup-mold@2e332a0b602c2fc65d2d3995941b1b29a5f554a0 # v1 - name: Generate CMake run: cmake -B build -DDPP_NO_VCPKG=ON -DAVX_TYPE=AVX0 -DCMAKE_BUILD_TYPE=Release ${{matrix.cfg.cmake-flags}} @@ -118,7 +118,8 @@ jobs: fail-fast: false # Don't fail everything if one fails. We want to test each OS/Compiler individually matrix: cfg: - - { arch: 'x64', concurrency: 3, os: macos-latest, cpp-version: clang++-14, cmake-flags: ''} + - { arch: 'x64', concurrency: 3, os: macos-latest, cpp-version: clang++-15, cmake-flags: '', xcode-version: '15.3' } + - { arch: 'x64', concurrency: 3, os: macos-latest, cpp-version: clang++-14, cmake-flags: '', xcode-version: '14.3.1' } steps: - name: Harden Runner uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1 @@ -128,6 +129,11 @@ jobs: - name: Checkout D++ uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - name: Update Xcode + uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0 + with: + xcode-version: ${{ matrix.cfg.xcode-version }} + - name: Install homebrew packages run: brew install cmake make libsodium opus openssl pkg-config