From c40e375e6f1c92def78e126f31828b7071e02698 Mon Sep 17 00:00:00 2001 From: Archie Date: Thu, 18 Jul 2024 20:08:37 +0100 Subject: [PATCH 1/5] ci: OSX runner now uses Xcode 15.3 --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e0a46360e..593361c511 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,7 @@ 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: ''} steps: - name: Harden Runner uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1 @@ -128,6 +128,11 @@ jobs: - name: Checkout D++ uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - name: Update Xcode + uses: maxim-lobanov/setup-xcode@v60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0 + with: + xcode-version: '15.3' + - name: Install homebrew packages run: brew install cmake make libsodium opus openssl pkg-config From 7049dabff74a779c7e33e2ae7da86def02b4c40c Mon Sep 17 00:00:00 2001 From: Archie Date: Thu, 18 Jul 2024 20:14:13 +0100 Subject: [PATCH 2/5] ci: made a new mac runner that is actually clang++14 --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 593361c511..5fcf829d10 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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++-15, 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 @@ -131,7 +132,7 @@ jobs: - name: Update Xcode uses: maxim-lobanov/setup-xcode@v60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0 with: - xcode-version: '15.3' + xcode-version: ${{ matrix.cfg.xcode-version }} - name: Install homebrew packages run: brew install cmake make libsodium opus openssl pkg-config From d420c5d9614b6e0635e51839eef76799fe90cf75 Mon Sep 17 00:00:00 2001 From: Archie Date: Thu, 18 Jul 2024 20:15:08 +0100 Subject: [PATCH 3/5] ci: Update Xcode step version no longer broken --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5fcf829d10..32944bb164 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,7 +130,7 @@ jobs: uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: Update Xcode - uses: maxim-lobanov/setup-xcode@v60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0 + uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0 with: xcode-version: ${{ matrix.cfg.xcode-version }} From 8f3d2654d423ccb111f2eaf94502076a93ad0c01 Mon Sep 17 00:00:00 2001 From: Archie Date: Thu, 18 Jul 2024 20:38:42 +0100 Subject: [PATCH 4/5] ci: clang check added --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32944bb164..364e02bfca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -134,6 +134,9 @@ jobs: with: xcode-version: ${{ matrix.cfg.xcode-version }} + - name: Clang Defines + run: clang++ -dM -E -x c /dev/null | grep __clang_m + - name: Install homebrew packages run: brew install cmake make libsodium opus openssl pkg-config From 260d731faa59d63500cc277e0b20656ec982d6cf Mon Sep 17 00:00:00 2001 From: Archie Date: Thu, 18 Jul 2024 20:42:06 +0100 Subject: [PATCH 5/5] no more clang check. bye bye --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 364e02bfca..32944bb164 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -134,9 +134,6 @@ jobs: with: xcode-version: ${{ matrix.cfg.xcode-version }} - - name: Clang Defines - run: clang++ -dM -E -x c /dev/null | grep __clang_m - - name: Install homebrew packages run: brew install cmake make libsodium opus openssl pkg-config