diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f916abe..a4b504b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,21 +6,16 @@ on: pull_request: branches: - '*' + workflow_dispatch: jobs: build: strategy: fail-fast: false matrix: - include: - - os: ubuntu-latest - name: linux - - os: macos-latest - name: mac - - os: windows-latest - name: windows - - name: ${{ matrix.name }} + os: [ macos-latest, windows-latest, ubuntu-26.04 ] + + name: ${{ matrix.os }} runs-on: ${{ matrix.os }} steps: @@ -33,6 +28,13 @@ jobs: with: arch: x64 + - name: Setup ccache + uses: hendrikmuhs/ccache-action@v1.2.24 + with: + key: ${{ runner.os }}-ccache + max-size: 2000M + verbose: 2 + - name: install linux dependencies if: runner.os == 'Linux' run: | @@ -40,7 +42,7 @@ jobs: sudo apt install libasound2-dev libxinerama-dev libx11-dev libxext-dev libfreetype-dev libwebkit2gtk-4.1-dev libglu1-mesa-dev xvfb ninja-build - name: configure - run: cmake --preset default + run: cmake . --preset ci - name: build run: cmake --build --preset ci diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d68ac4..1ea8fde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,15 @@ -cmake_minimum_required(VERSION 3.28) +cmake_minimum_required(VERSION 4.3) +project(Eq VERSION 1.0.0) + + set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15) - # add_compile_options(-fsanitize=address) # add_link_options(-fsanitize=address) # add_link_options(-fsanitize=thread) -project(Eq VERSION 1.0.0) add_subdirectory(JUCE) diff --git a/CMakePresets.json b/CMakePresets.json index 3f1906b..daafc5f 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -7,11 +7,15 @@ "binaryDir": "${sourceDir}/__build" }, { - "name": "linux-sandbox", + "name": "ci", "generator": "Ninja", - "binaryDir": "${sourceDir}/__build-linux-sandbox", + "binaryDir": "${sourceDir}/__build", "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release" + "CMAKE_BUILD_TYPE": "Release", + "CMAKE_C_COMPILER_LAUNCHER": "ccache", + "CMAKE_CXX_COMPILER_LAUNCHER": "ccache", + "CMAKE_OBJC_COMPILER_LAUNCHER": "ccache", + "CMAKE_OBJCXX_COMPILER_LAUNCHER": "ccache" } } ], diff --git a/JUCE b/JUCE index 7c9d378..ee9bb7b 160000 --- a/JUCE +++ b/JUCE @@ -1 +1 @@ -Subproject commit 7c9d3783b127263d72bb65fe0a7e2dc8a02a7ac2 +Subproject commit ee9bb7b4d8fa7cdfcde5d1e85e859bf02c6112f5