Skip to content

Commit

Permalink
Merged master in to feature/automation_modes
Browse files Browse the repository at this point in the history
  • Loading branch information
drowaudio committed Feb 5, 2025
2 parents 38eb3cf + 597b227 commit 618331f
Show file tree
Hide file tree
Showing 39 changed files with 1,750 additions and 151 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/generate_coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
cmake -G Ninja -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo
cmake --build ./build --target coverage --config RelWithDebInfo --parallel
build/coverage_artefacts/RelWithDebInfo/coverage
lcov --capture --directory "build" --output-file coverage.info \
lcov --capture --directory "build" --output-file coverage.info --rc geninfo_unexecuted_blocks=1 --ignore-errors negative --ignore-errors unused \
--exclude "tests/coverage/*" \
--exclude "examples/common/*" \
--exclude "tests/coverage/coverage.h" \
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/juce_compat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ jobs:
run: sudo xcode-select -s /Applications/Xcode_15.3.app

- uses: actions/checkout@v4
with:
submodules: true
# with:
# submodules: true

- name: Update juce to tip
run: |
cd modules/juce
git config pull.rebase false # merge changes
git pull origin develop
# - name: Update juce to tip
# run: |
# cd modules/juce
# git config pull.rebase false # merge changes
# git pull origin develop

# Generate build files
- name: "Build all"
id: generate
shell: bash
run: |
cmake -B ${{ env.BUILD_DIR }} ${{ matrix.generator }}
cmake -B ${{ env.BUILD_DIR }} ${{ matrix.generator }} -DJUCE_CPM_DEVELOP=1
cmake --build ./${{ env.BUILD_DIR }} --config ${{ env.BUILD_CONFIG }} --parallel --target DemoRunner EngineInPluginDemo_common TestRunner Benchmarks
8 changes: 7 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ project(tracktion
HOMEPAGE_URL "https://github.com/Tracktion/tracktion_engine"
)

add_subdirectory(modules/juce)
if (JUCE_CPM_DEVELOP)
include(cmake/CPM.cmake)
CPMAddPackage("gh:juce-framework/JUCE#develop")
else()
add_subdirectory(modules/juce)
endif()

add_subdirectory(modules)

enable_testing()
Expand Down
Loading

0 comments on commit 618331f

Please sign in to comment.