From fda53d4f3918fa8f247042101e0020d45f7bea06 Mon Sep 17 00:00:00 2001 From: Archie Jaskowicz Date: Sat, 23 Nov 2024 10:17:16 +0000 Subject: [PATCH 1/3] ci: force pkgconf unlink for brew --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f29e1affe..3c8d1404cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -149,6 +149,9 @@ jobs: with: xcode-version: ${{ matrix.cfg.xcode-version }} + - name: Force unlink pkg-config + run: brew link --overwrite pkgconf + - name: Install homebrew packages run: brew install cmake make opus openssl pkg-config From 2b7f7f342d031c4f6c17e0544782a57dc7041da9 Mon Sep 17 00:00:00 2001 From: Archie Jaskowicz Date: Sat, 23 Nov 2024 12:17:01 +0000 Subject: [PATCH 2/3] ci: removed pkg-config from brew as no longer needed --- .github/workflows/ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c8d1404cc..94f9441983 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -149,11 +149,8 @@ jobs: with: xcode-version: ${{ matrix.cfg.xcode-version }} - - name: Force unlink pkg-config - run: brew link --overwrite pkgconf - - name: Install homebrew packages - run: brew install cmake make opus openssl pkg-config + run: brew install cmake make opus openssl - name: Generate CMake run: cmake -B build -DDPP_NO_VCPKG=ON -DCMAKE_BUILD_TYPE=Release -DDPP_CORO=ON -DAVX_TYPE=AVX0 From 246f2d76459f6f08babe622b10895efdb9cbcbcc Mon Sep 17 00:00:00 2001 From: Archie Jaskowicz Date: Sat, 23 Nov 2024 12:57:57 +0000 Subject: [PATCH 3/3] ci: macos version will now always be 15 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94f9441983..a0f3dc4543 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,9 +132,9 @@ jobs: fail-fast: false # Don't fail everything if one fails. We want to test each OS/Compiler individually matrix: cfg: - - { arch: 'arm64', concurrency: 3, os: macos-latest, cpp: clang++, version: 16, cmake-flags: '', xcode-version: '16.0.0' } - - { arch: 'arm64', concurrency: 3, os: macos-latest, cpp: clang++, version: 15, cmake-flags: '', xcode-version: '15.3' } - - { arch: 'arm64', concurrency: 3, os: macos-latest, cpp: clang++, version: 14, cmake-flags: '', xcode-version: '14.3.1' } + - { arch: 'arm64', concurrency: 3, os: macos-15, cpp: clang++, version: 16, cmake-flags: '', xcode-version: '16.0.0' } + - { arch: 'arm64', concurrency: 3, os: macos-15, cpp: clang++, version: 15, cmake-flags: '', xcode-version: '15.3' } + - { arch: 'arm64', concurrency: 3, os: macos-15, cpp: clang++, version: 14, cmake-flags: '', xcode-version: '14.3.1' } steps: - name: Harden Runner uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1