diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml deleted file mode 100644 index 56704b3..0000000 --- a/.github/workflows/cmake-multi-platform.yml +++ /dev/null @@ -1,64 +0,0 @@ -# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform. -# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml -name: CMake on multiple platforms - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - build: - runs-on: ${{ matrix.os }} - - strategy: - # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable. - fail-fast: false - - # Set up a matrix to run the following 3 configurations: - # 1. - # 2. - # - # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list. - matrix: - os: [ubuntu-latest] - build_type: [Release] - c_compiler: [gcc, clang] - include: - - os: ubuntu-latest - c_compiler: gcc - cpp_compiler: g++ - - os: ubuntu-latest - c_compiler: clang - cpp_compiler: clang++ - - steps: - - uses: actions/checkout@v4 - - - name: Set reusable strings - # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file. - id: strings - shell: bash - run: | - echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" - - - name: Configure CMake - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: > - cmake -B ${{ steps.strings.outputs.build-output-dir }} - -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} - -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} - -S ${{ github.workspace }} - - - name: Build - # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). - run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} - - - name: Test - working-directory: ${{ steps.strings.outputs.build-output-dir }} - # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). - # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: ctest --build-config ${{ matrix.build_type }} diff --git a/.github/workflows/cpp-main.yml b/.github/workflows/cpp-main.yml new file mode 100644 index 0000000..3a1d104 --- /dev/null +++ b/.github/workflows/cpp-main.yml @@ -0,0 +1,108 @@ +# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform. +# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml +name: CMake on multiple platforms + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + runs-on: ${{ matrix.os }} + + strategy: + # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable. + fail-fast: false + + # Set up a matrix to run the following 3 configurations: + # 1. + # 2. + # + # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list. + matrix: + os: [ ubuntu-latest ] + build_type: [ Release ] + c_compiler: [ gcc ] + include: + - os: ubuntu-latest + c_compiler: gcc + cpp_compiler: g++ + + steps: + - uses: actions/checkout@v4 + with: + submodules: true + + - name: Set reusable strings + # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file. + id: strings + shell: bash + run: | + echo "build-output-dir=${{ github.workspace }}/lcloud-sql-discovery-cpp/build" >> "$GITHUB_OUTPUT" + + - name: APT + run: | + sudo apt-get update + sudo apt-get install -y cmake gcc g++ libpq-dev lcov gcovr + + - name: RxCpp + working-directory: ${{ github.workspace }}/lcloud-sql-discovery-cpp/RxCpp + run: | + mkdir build + cd build + cmake -G"Unix Makefiles" \ + -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} \ + -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ \ + -DCMAKE_BUILD_TYPE=Release -DRXCPP_DISABLE_TESTS_AND_EXAMPLES=1 ../projects/CMake + make -j4 + sudo make install + + - name: libpqxx + working-directory: ${{ github.workspace }}/lcloud-sql-discovery-cpp/libpqxx + run: | + mkdir build + cd build + cmake -G"Unix Makefiles" \ + -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} \ + -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \ + -DCMAKE_C_FLAGS="-DPQXX_PQ_STATIC=1" \ + -DCMAKE_CXX_FLAGS="-DPQXX_PQ_STATIC=1" \ + -DSKIP_BUILD_TEST=1 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ .. + make -j4 + sudo make install + + - name: googletest + working-directory: ${{ github.workspace }}/lcloud-sql-discovery-cpp/googletest + run: | + mkdir build + cd build + cmake \ + -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} \ + -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \ + .. + make -j4 + sudo make install + + - name: Configure CMake + working-directory: ${{ github.workspace }}/lcloud-sql-discovery-cpp/googletest + run: > + cmake -B ${{ steps.strings.outputs.build-output-dir }} + -S ${{ github.workspace }}/lcloud-sql-discovery-cpp + -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} + -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} + -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} + .. + + - name: Build + # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). + run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} + + - name: Test + working-directory: ${{ steps.strings.outputs.build-output-dir }} + run: | + cd ./test + ./unit_tests --gtest_color=no \ No newline at end of file diff --git a/lcloud-sql-discovery-cpp/libpqxx b/lcloud-sql-discovery-cpp/libpqxx index 9dd7110..98ea79a 160000 --- a/lcloud-sql-discovery-cpp/libpqxx +++ b/lcloud-sql-discovery-cpp/libpqxx @@ -1 +1 @@ -Subproject commit 9dd71102e1f3e10b0f14eed253873ee6ce2a4880 +Subproject commit 98ea79a03eaa0f0185dafd4135930a12ecbb9ec4