Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Windows CI builds #586

Merged
merged 48 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
1d8ea0b
added several boost versions
goncaloalmeida Nov 13, 2023
9430826
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
2efe4b5
Merge pull request #1 from goncaloalmeida/windows_ci
goncaloalmeida Nov 13, 2023
2862298
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
b03c767
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
10857b4
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
528445d
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
be0f7d8
Merge branch 'master' into test_ci
goncaloalmeida Nov 13, 2023
618ceb1
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
a1c4f7b
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
8abd25f
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
5486894
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
3612728
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
8fb422a
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
81e1b34
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
96cd0d6
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
e5c6156
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
0490fe8
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
c93cb37
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
fd54579
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
ddcafc3
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
caa16ac
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
13d6bac
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
5c161e1
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
07394ca
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
3a87049
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
7e99f0a
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
8e87e6e
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
562fdb9
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
a1e3ceb
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
27f33e4
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
f5c7e3f
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
ddf7396
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
5a8b51b
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
596578d
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
26679b4
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
f1fc34b
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
323bc70
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
ea8bc06
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
8539906
Update c-cpp.yml
goncaloalmeida Nov 13, 2023
1f89c83
Merge branch 'COVESA:master' into master
goncaloalmeida Nov 29, 2023
6912401
Update c-cpp.yml
goncaloalmeida Nov 29, 2023
6035b8b
Update c-cpp.yml
goncaloalmeida Nov 29, 2023
a0f8dd1
Merge pull request #2 from goncaloalmeida/test_ci
goncaloalmeida Nov 29, 2023
6512a36
Merge branch 'COVESA:master' into master
goncaloalmeida Dec 11, 2023
f2fe3af
Revert "Add gtest to Fetch content #550 (#551)"
Dec 11, 2023
cd9c637
Fix CI for windows builds
goncaloalmeida Dec 11, 2023
43ad626
Merge pull request #3 from goncaloalmeida/fix_windows_tests_build
goncaloalmeida Dec 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jobs:
sudo apt-get update -qq
sudo apt-get install -y googletest asciidoc source-highlight doxygen graphviz

- name: Run CMake
run: |
cmake -Bbuild \
-DBOOST_ROOT=/home/runner/boost/boost/ -DGTEST_ROOT=/usr/src/googletest/googletest/ -DCMAKE_INSTALL_PREFIX=${{ runner.workspace }}/install .
cmake --build build -t all build_tests doc install
- name: Run CMake config
run: cmake -Bbuild -DBOOST_ROOT=/home/runner/boost/boost/ -DGTEST_ROOT=/usr/src/googletest/googletest/ -DCMAKE_INSTALL_PREFIX=${{ runner.workspace }}/install .

- name: Build CMake
run: cmake --build build -t all build_tests doc install

- uses: actions/upload-artifact@v2
with:
Expand All @@ -56,6 +56,7 @@ jobs:
- uses: actions/checkout@v3

- name: Run CMake
run: |
cmake -Bbuild -D BOOST_ROOT=C:\runner\boost/boost\ .
cmake --build build
run: cmake -Bbuild -D BOOST_ROOT=C:\runner\boost/boost\ .

- name: Build CMake
run: cmake --build build
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ if (NOT GTEST_ROOT)
if (DEFINED ENV{GTEST_ROOT})
set(GTEST_ROOT $ENV{GTEST_ROOT})
else()
include(FetchContent)
FetchContent_Declare(googletest GIT_REPOSITORY https://github.com/google/googletest.git GIT_TAG v1.14.0)
FetchContent_Populate(googletest)
set(GTEST_ROOT ${googletest_SOURCE_DIR})
set(GTEST_ROOT "n/a" CACHE STRING "Path to root folder of googletest. Must be set for building the tests.")
endif()
endif()

Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ Optional:
- A C++14 enabled compiler is needed (default for gcc >= v6.1).
- vsomeip uses CMake as buildsystem.
- vsomeip uses Boost >= 1.55.0:
- Google's test framework (downloaded automaticaly)

For the tests Google's test framework https://code.google.com/p/googletest/[gtest] is needed.
-- URL: https://googletest.googlecode.com/files/gtest-<version>.zip

To build the documentation asciidoc, source-highlight, doxygen and graphviz is needed:
--`sudo apt-get install asciidoc source-highlight doxygen graphviz`
Expand Down
Loading