From abcd8beba51daeb139127423cd43d15d10a2d8ae Mon Sep 17 00:00:00 2001 From: Ricardo Roldao Date: Fri, 10 May 2024 15:01:56 +0100 Subject: [PATCH] Refactor googletest experimental --- .github/workflows/makefile.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index b50df53..70491eb 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -7,7 +7,7 @@ on: branches: ["master"] jobs: - build: + build_on_ubuntu_22_04: runs-on: [ubuntu-22.04] steps: @@ -26,15 +26,11 @@ jobs: repository: COVESA/vsomeip path: "vsomeip" - - name: "Install googletest" - run: | - sudo apt-get install libgtest-dev - cd /usr/src/gtest - sudo cmake CMakeLists.txt - sudo make - sudo cp lib/*.a /usr/lib - sudo ln -s /usr/lib/libgtest.a /usr/local/lib/libgtest.a - sudo ln -s /usr/lib/libgtest_main.a /usr/local/lib/libgtest_main.a + - name: "Checkout googletest" + uses: actions/checkout@v3 + with: + repository: google/googletest + path: "googletest" - name: "Build capicxx-core-runtime" run: | @@ -54,12 +50,12 @@ jobs: - name: "Build vsomeip" run: | - cmake -S vsomeip -B vsomeip -D GTEST_ROOT=/usr/src/googletest -D BOOST_ROOT=/home/runner/boost/boost/ -D CMAKE_PREFIX_PATH=install -D CMAKE_INSTALL_PREFIX=install + cmake -S vsomeip -B vsomeip -D GTEST_ROOT=${{ runner.workspace }}\vsomeip\googletest -D BOOST_ROOT=/home/runner/boost/boost/ -D CMAKE_PREFIX_PATH=install -D CMAKE_INSTALL_PREFIX=install cmake --build vsomeip cmake --install vsomeip --strip - name: "Build capicxx-someip-runtime" run: | - cmake -S . -B build-someip-runtime -D GTEST_ROOT=/usr/src/googletest -D CMAKE_PREFIX_PATH=install -D CMAKE_INSTALL_PREFIX=install + cmake -S . -B build-someip-runtime -D GTEST_ROOT=${{ runner.workspace }}\vsomeip\googletest -D CMAKE_PREFIX_PATH=install -D CMAKE_INSTALL_PREFIX=install cmake --build build-someip-runtime cmake --install build-someip-runtime --strip