Skip to content

Commit

Permalink
Run GitHub Actions workflow on merge-key-support branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Ortham committed Sep 30, 2023
1 parent 5a312d5 commit c7bf224
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Github PR
on:
push:
branches: [ master ]
branches: [ master, merge-key-support ]
pull_request:
branches: [ master ]
workflow_dispatch:
Expand Down Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Build Tests
shell: bash
run: |
cmake ${{ env.CMAKE_GENERATOR }} -S "${{ github.workspace }}" -B build -DCMAKE_CXX_STANDARD=${{ matrix.cxx_standard }} -DYAML_BUILD_SHARED_LIBS=${{ env.YAML_BUILD_SHARED_LIBS }} -DYAML_CPP_BUILD_TESTS=ON
cmake ${{ env.CMAKE_GENERATOR }} -S "${{ github.workspace }}" -B build -DCMAKE_CXX_STANDARD=${{ matrix.cxx_standard }} -DYAML_BUILD_SHARED_LIBS=${{ env.YAML_BUILD_SHARED_LIBS }} -DYAML_CPP_BUILD_TESTS=ON -DYAML_CPP_SUPPORT_MERGE_KEYS=ON
cd build && cmake --build . --parallel ${{ steps.cpu-cores.outputs.count }}
- name: Run Tests
Expand Down

0 comments on commit c7bf224

Please sign in to comment.