-
Notifications
You must be signed in to change notification settings - Fork 517
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix Github Actions subdir example to also triggers on pull requests
Also fix the introduced mixed endlines
- Loading branch information
Showing
2 changed files
with
96 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,54 @@ | ||
| name: build | ||
|
|
||
| name: build | ||
|
|
||
| on: [push, pull_request] | ||
|
|
||
| jobs: | ||
| build: | ||
| name: ${{ matrix.config.name }} | ||
| runs-on: ${{ matrix.config.os }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| config: | ||
| - { | ||
| name: "Windows Latest MSVC", | ||
| os: windows-latest, | ||
| build_type: "Debug", cc: "cl", cxx: "cl", | ||
| } | ||
| # TODO: this is not working, since CMake is using generator for latest Visual Studio | ||
| #- { | ||
| # name: "Windows Latest MinGW", | ||
| # os: windows-latest, | ||
| # build_type: "Debug", cc: "gcc", cxx: "g++" | ||
| # } | ||
| - { | ||
| name: "Ubuntu Latest GCC", | ||
| os: ubuntu-latest, | ||
| build_type: "Debug", cc: "gcc", cxx: "g++" | ||
| } | ||
| - { | ||
| name: "macOS Latest Clang", | ||
| os: macos-latest, | ||
| build_type: "Debug", cc: "clang", cxx: "clang++" | ||
| } | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: submodule | ||
| run: git submodule update --init --recursive | ||
| - name: configure | ||
| shell: cmake -P {0} | ||
| run: | | ||
| set(ENV{CC} ${{matrix.config.cc}}) | ||
| set(ENV{CXX} ${{matrix.config.cxx}}) | ||
| - name: generate | ||
| run: | | ||
| mkdir build | ||
| cd build | ||
| cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=${{matrix.config.build_type}} -DSQLITECPP_BUILD_EXAMPLES=ON -DSQLITECPP_BUILD_TESTS=ON -DSQLITECPP_RUN_CPPCHECK=OFF -DSQLITECPP_RUN_CPPLINT=OFF .. | ||
| - name: build | ||
| run: cmake --build build --config ${{matrix.config.build_type}} | ||
| - name: test | ||
| run: | | ||
| cd build | ||
| ctest --verbose --output-on-failure | ||
|
|
||
| jobs: | ||
| build: | ||
| name: ${{ matrix.config.name }} | ||
| runs-on: ${{ matrix.config.os }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| config: | ||
| - { | ||
| name: "Windows Latest MSVC", | ||
| os: windows-latest, | ||
| build_type: "Debug", cc: "cl", cxx: "cl", | ||
| } | ||
| # TODO: this is not working, since CMake is using generator for latest Visual Studio | ||
| #- { | ||
| # name: "Windows Latest MinGW", | ||
| # os: windows-latest, | ||
| # build_type: "Debug", cc: "gcc", cxx: "g++" | ||
| # } | ||
| - { | ||
| name: "Ubuntu Latest GCC", | ||
| os: ubuntu-latest, | ||
| build_type: "Debug", cc: "gcc", cxx: "g++" | ||
| } | ||
| - { | ||
| name: "macOS Latest Clang", | ||
| os: macos-latest, | ||
| build_type: "Debug", cc: "clang", cxx: "clang++" | ||
| } | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: submodule | ||
| run: git submodule update --init --recursive | ||
| - name: configure | ||
| shell: cmake -P {0} | ||
| run: | | ||
| set(ENV{CC} ${{matrix.config.cc}}) | ||
| set(ENV{CXX} ${{matrix.config.cxx}}) | ||
| - name: generate | ||
| run: | | ||
| mkdir build | ||
| cd build | ||
| cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=${{matrix.config.build_type}} -DSQLITECPP_BUILD_EXAMPLES=ON -DSQLITECPP_BUILD_TESTS=ON -DSQLITECPP_RUN_CPPCHECK=OFF -DSQLITECPP_RUN_CPPLINT=OFF .. | ||
| - name: build | ||
| run: cmake --build build --config ${{matrix.config.build_type}} | ||
| - name: test | ||
| run: | | ||
| cd build | ||
| ctest --verbose --output-on-failure |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,43 @@ | ||
| name: subdir_example | ||
|
|
||
| on: [push] | ||
|
|
||
| jobs: | ||
| build: | ||
| name: ${{ matrix.config.name }} | ||
| runs-on: ${{ matrix.config.os }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| config: | ||
| - { | ||
| name: "Windows Latest MSVC", | ||
| os: windows-latest, | ||
| build_type: "Debug", cc: "cl", cxx: "cl", | ||
| } | ||
| - { | ||
| name: "Ubuntu Latest GCC", | ||
| os: ubuntu-latest, | ||
| build_type: "Debug", cc: "gcc", cxx: "g++" | ||
| } | ||
| - { | ||
| name: "macOS Latest Clang", | ||
| os: macos-latest, | ||
| build_type: "Debug", cc: "clang", cxx: "clang++" | ||
| } | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: configure | ||
| shell: cmake -P {0} | ||
| run: | | ||
| set(ENV{CC} ${{matrix.config.cc}}) | ||
| set(ENV{CXX} ${{matrix.config.cxx}}) | ||
| - name: generate | ||
| run: | | ||
| cd examples/example2 | ||
| mkdir build | ||
| cd build | ||
| cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=${{matrix.config.build_type}} .. | ||
| - name: build | ||
| run: cmake --build examples/example2/build --config ${{matrix.config.build_type}} | ||
| name: subdir_example | ||
|
|
||
| on: [push, pull_request] | ||
|
|
||
| jobs: | ||
| build: | ||
| name: ${{ matrix.config.name }} | ||
| runs-on: ${{ matrix.config.os }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| config: | ||
| - { | ||
| name: "Windows Latest MSVC", | ||
| os: windows-latest, | ||
| build_type: "Debug", cc: "cl", cxx: "cl", | ||
| } | ||
| - { | ||
| name: "Ubuntu Latest GCC", | ||
| os: ubuntu-latest, | ||
| build_type: "Debug", cc: "gcc", cxx: "g++" | ||
| } | ||
| - { | ||
| name: "macOS Latest Clang", | ||
| os: macos-latest, | ||
| build_type: "Debug", cc: "clang", cxx: "clang++" | ||
| } | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: configure | ||
| shell: cmake -P {0} | ||
| run: | | ||
| set(ENV{CC} ${{matrix.config.cc}}) | ||
| set(ENV{CXX} ${{matrix.config.cxx}}) | ||
| - name: generate | ||
| run: | | ||
| cd examples/example2 | ||
| mkdir build | ||
| cd build | ||
| cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=${{matrix.config.build_type}} .. | ||
| - name: build | ||
| run: cmake --build examples/example2/build --config ${{matrix.config.build_type}} |