Fix Github Actions subdir example to also triggers on pull requests

Also fix the introduced mixed endlines
This commit is contained in:
Sébastien Rombauts 2022-12-12 08:47:13 +01:00
parent cd5f3ff085
commit 833f007a0b
2 changed files with 96 additions and 96 deletions

View File

@ -1,54 +1,54 @@
name: build name: build
on: [push, pull_request] on: [push, pull_request]
jobs: jobs:
build: build:
name: ${{ matrix.config.name }} name: ${{ matrix.config.name }}
runs-on: ${{ matrix.config.os }} runs-on: ${{ matrix.config.os }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
config: config:
- { - {
name: "Windows Latest MSVC", name: "Windows Latest MSVC",
os: windows-latest, os: windows-latest,
build_type: "Debug", cc: "cl", cxx: "cl", build_type: "Debug", cc: "cl", cxx: "cl",
} }
# TODO: this is not working, since CMake is using generator for latest Visual Studio # TODO: this is not working, since CMake is using generator for latest Visual Studio
#- { #- {
# name: "Windows Latest MinGW", # name: "Windows Latest MinGW",
# os: windows-latest, # os: windows-latest,
# build_type: "Debug", cc: "gcc", cxx: "g++" # build_type: "Debug", cc: "gcc", cxx: "g++"
# } # }
- { - {
name: "Ubuntu Latest GCC", name: "Ubuntu Latest GCC",
os: ubuntu-latest, os: ubuntu-latest,
build_type: "Debug", cc: "gcc", cxx: "g++" build_type: "Debug", cc: "gcc", cxx: "g++"
} }
- { - {
name: "macOS Latest Clang", name: "macOS Latest Clang",
os: macos-latest, os: macos-latest,
build_type: "Debug", cc: "clang", cxx: "clang++" build_type: "Debug", cc: "clang", cxx: "clang++"
} }
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: submodule - name: submodule
run: git submodule update --init --recursive run: git submodule update --init --recursive
- name: configure - name: configure
shell: cmake -P {0} shell: cmake -P {0}
run: | run: |
set(ENV{CC} ${{matrix.config.cc}}) set(ENV{CC} ${{matrix.config.cc}})
set(ENV{CXX} ${{matrix.config.cxx}}) set(ENV{CXX} ${{matrix.config.cxx}})
- name: generate - name: generate
run: | run: |
mkdir build mkdir build
cd 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 .. 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 - name: build
run: cmake --build build --config ${{matrix.config.build_type}} run: cmake --build build --config ${{matrix.config.build_type}}
- name: test - name: test
run: | run: |
cd build cd build
ctest --verbose --output-on-failure ctest --verbose --output-on-failure

View File

@ -1,43 +1,43 @@
name: subdir_example name: subdir_example
on: [push] on: [push, pull_request]
jobs: jobs:
build: build:
name: ${{ matrix.config.name }} name: ${{ matrix.config.name }}
runs-on: ${{ matrix.config.os }} runs-on: ${{ matrix.config.os }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
config: config:
- { - {
name: "Windows Latest MSVC", name: "Windows Latest MSVC",
os: windows-latest, os: windows-latest,
build_type: "Debug", cc: "cl", cxx: "cl", build_type: "Debug", cc: "cl", cxx: "cl",
} }
- { - {
name: "Ubuntu Latest GCC", name: "Ubuntu Latest GCC",
os: ubuntu-latest, os: ubuntu-latest,
build_type: "Debug", cc: "gcc", cxx: "g++" build_type: "Debug", cc: "gcc", cxx: "g++"
} }
- { - {
name: "macOS Latest Clang", name: "macOS Latest Clang",
os: macos-latest, os: macos-latest,
build_type: "Debug", cc: "clang", cxx: "clang++" build_type: "Debug", cc: "clang", cxx: "clang++"
} }
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: configure - name: configure
shell: cmake -P {0} shell: cmake -P {0}
run: | run: |
set(ENV{CC} ${{matrix.config.cc}}) set(ENV{CC} ${{matrix.config.cc}})
set(ENV{CXX} ${{matrix.config.cxx}}) set(ENV{CXX} ${{matrix.config.cxx}})
- name: generate - name: generate
run: | run: |
cd examples/example2 cd examples/example2
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=${{matrix.config.build_type}} .. cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=${{matrix.config.build_type}} ..
- name: build - name: build
run: cmake --build examples/example2/build --config ${{matrix.config.build_type}} run: cmake --build examples/example2/build --config ${{matrix.config.build_type}}