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

Minus vcpkg #22

Merged
merged 62 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
fef4220
suppression du sous module vcpkg
yobeonline Jan 6, 2024
c223046
using vcpkg from runners in unit tests.
yobeonline Jan 7, 2024
e121f7c
fix syntax
yobeonline Jan 7, 2024
8bfbefa
Fix steps
yobeonline Jan 7, 2024
c96c6e9
Fix steps
yobeonline Jan 7, 2024
2dd1c3c
Fix steps
yobeonline Jan 7, 2024
f848f2b
Fix steps
yobeonline Jan 7, 2024
b34018f
Fix steps
yobeonline Jan 7, 2024
22a3aef
Fix steps
yobeonline Jan 7, 2024
51f3258
changed path to vcpkg
yobeonline Jan 20, 2024
e093fff
listing pour voir
yobeonline Jan 20, 2024
e50901a
fix
yobeonline Jan 20, 2024
0cf0ba2
frf
yobeonline Jan 20, 2024
7372954
try
yobeonline Jan 20, 2024
263af66
further down
yobeonline Jan 20, 2024
9a55440
fu
yobeonline Jan 20, 2024
7bdb945
t
yobeonline Jan 20, 2024
e5d4833
cleaning
yobeonline Jan 20, 2024
b37dfb3
other ci
yobeonline Jan 21, 2024
743c2a0
fix clang format version
yobeonline Jan 21, 2024
f3f8735
f
yobeonline Jan 21, 2024
dcacda5
fix tests
yobeonline Jan 21, 2024
64e8688
trying to fix coverage
yobeonline Jan 21, 2024
7453ebc
changed cover
yobeonline Jan 21, 2024
b25917c
third partu action
yobeonline Jan 21, 2024
f246de6
fix vcpkg
yobeonline Jan 21, 2024
7c4c508
dd
yobeonline Jan 21, 2024
22f7a8d
m
yobeonline Jan 21, 2024
8c760e4
kinda revert
yobeonline Jan 21, 2024
d7f6b06
g
yobeonline Jan 21, 2024
3a2cac3
sdf
yobeonline Jan 21, 2024
74d1816
removing buyild dir
yobeonline Jan 21, 2024
62ff0b4
qsd
yobeonline Jan 21, 2024
5cf15f7
fds
yobeonline Jan 21, 2024
f34c638
verbose
yobeonline Jan 21, 2024
4cb003b
qs
yobeonline Jan 21, 2024
e190ee8
dsfq
yobeonline Jan 21, 2024
43577dc
sdf
yobeonline Jan 21, 2024
e2f757a
sdfsdf
yobeonline Jan 21, 2024
558106b
sdf
yobeonline Jan 21, 2024
1bf3c0a
sdf
yobeonline Jan 21, 2024
cdbe349
g
yobeonline Jan 21, 2024
303c1bf
ioytjh
yobeonline Jan 21, 2024
6b8d6c0
clang
yobeonline Jan 21, 2024
26ccc04
ljhjsqkd
yobeonline Jan 21, 2024
20896ea
o1
yobeonline Jan 21, 2024
2ecaa74
qsd
yobeonline Jan 21, 2024
697c210
khglkj
yobeonline Jan 21, 2024
b998613
Using thje right version of gcov
yobeonline Feb 6, 2024
f164e2a
removing unwanted stuff
yobeonline Feb 6, 2024
6466ba7
fix typos
yobeonline Feb 6, 2024
15c58e1
added xml cobertura file as artifact
yobeonline Feb 6, 2024
372f83c
changed cobertura report settings
yobeonline Feb 6, 2024
298f9ee
removed artifact
yobeonline Feb 6, 2024
02a12e5
changed cobertura report algo
yobeonline Feb 6, 2024
2e221cc
tweak
yobeonline Feb 6, 2024
17004f0
pr number
yobeonline Feb 6, 2024
81d918f
permission
yobeonline Feb 6, 2024
019c91e
dsf
yobeonline Feb 6, 2024
208a599
another action
yobeonline Feb 6, 2024
e1d6402
permissions
yobeonline Feb 6, 2024
17d159d
Revert "permissions"
yobeonline Feb 6, 2024
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
9 changes: 4 additions & 5 deletions .github/workflows/code_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ jobs:
cmake-format:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Format CMake files
uses: PuneetMatharu/[email protected]
Expand All @@ -17,9 +16,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/clang-format-action@v4.5.0
uses: jidicula/clang-format-action@v4.11.0
with:
clang-format-version: '14'
clang-format-version: '17'
61 changes: 31 additions & 30 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,54 +4,55 @@ on: [push]
jobs:
coverage:
runs-on: ubuntu-latest
permissions:
pull-requests: write
contents: read
steps:
- uses: actions/checkout@v2
with:
submodules: 'true'
- uses: actions/checkout@v4

- name: Get latest cmake
uses: lukka/get-cmake@latest

- name: set compiler
run: |
echo "CXX=g++-10" >> $GITHUB_ENV
echo "CC=gcc-10" >> $GITHUB_ENV
- name: Install gcovr
run: pip install gcovr

- name: Configure
env:
CXXFLAGS: --coverage -g -O0
CFLAGS: --coverage -g -O0
CXXFLAGS: --coverage -fprofile-abs-path -g -O1
CFLAGS: --coverage -fprofile-abs-path -g -O1
LDFLAGS: --coverage
run: cmake --toolchain ../vcpkg/scripts/buildsystems/vcpkg.cmake -B build -S .
CC: gcc-13
CXX: g++-13 # gcov (!= gcovr) version should match
run: cmake -S . -B build -D VCPKG_TARGET_TRIPLET=x64-linux --toolchain "${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake"

- name: Build
run: cmake --build build --parallel

- name: Execute
run: cmake --build build --target test

- name: Install gcovr
run: |
sudo apt-get update
sudo apt-get install -yq gcovr
sudo apt-get clean
run: ctest --test-dir build

- name: Create report
run: |
mkdir html
gcovr --filter include/io1/money.hpp --exclude-unreachable-branches --exclude-lines-by-pattern '.*assert.*' --print-summary -x coverage.xml --html-details html/index.html --html-details-syntax-highlighting -r . build

- uses: 5monkeys/cobertura-action@v13
with:
path: coverage.xml
repo_token: ${{ secrets.GITHUB_TOKEN }}
minimum_coverage: 84
fail_below_threshold: true
show_line: true
show_branch: true
show_missing: true
mkdir build/html
gcovr --gcov-executable /usr/bin/gcov-13 --filter include/io1/money.hpp --exclude-unreachable-branches --exclude-lines-by-pattern '.*assert.*' --print-summary -x build/coverage.xml --html-details build/html/index.html --html-details-syntax-highlighting -r . build

- uses: actions/upload-artifact@v3
with:
name: detailed coverage report
path: html
path: build/html

- uses: irongut/[email protected]
with:
filename: build/coverage.xml
badge: true
fail_below_min: true
format: markdown
output: both
thresholds: '75 90'

- name: Add Coverage PR Comment
uses: mshick/add-pr-comment@v2
with:
message-id: coverage
refresh-message-position: true
message-path: code-coverage-results.md
57 changes: 40 additions & 17 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,50 @@ jobs:
matrix:
config: [Release, Debug]
os: [ubuntu-latest, windows-latest]
compiler: [gcc, clang, msvc]
exclude:
- os: windows-latest
compiler: gcc
- os: windows-latest
compiler: clang
- os: ubuntu-latest
compiler: msvc
steps:
- uses: actions/checkout@v2
with:
submodules: 'true'
- uses: actions/checkout@v4

- name: Get latest cmake
uses: lukka/get-cmake@latest

- name: set compiler
if: matrix.os == 'ubuntu-latest'
- name: Configure
shell: cmake -P {0}
run: |
echo "CXX=g++-10" >> $GITHUB_ENV
echo "CC=gcc-10" >> $GITHUB_ENV

- name: Configure Linux
if: matrix.os == 'ubuntu-latest'
run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.config }} --preset gcc-dev -B build -S .

- name: Configure Windows
if: matrix.os == 'windows-latest'
run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.config }} --preset msvc-dev -B build -S .
if ("${{ matrix.compiler }}" STREQUAL "msvc")
set(vcpkg_triplet x64-windows)
set(compiler_flags "/EHsc /W4")
else()
set(vcpkg_triplet x64-linux)
set(compiler_flags "-Wall -Wextra -Wpedantic -Wconversion -Wshadow")
if ("${{ matrix.compiler }}" STREQUAL "gcc")
set(ENV{CC} "gcc-13")
set(ENV{CXX} "g++-13")
else()
set(ENV{CC} "clang-15")
set(ENV{CXX} "clang++-15")
endif()
endif()
execute_process(
COMMAND cmake
-S .
-B build
-D CMAKE_BUILD_TYPE=${{ matrix.config }}
-D VCPKG_TARGET_TRIPLET=${vcpkg_triplet}
-D "CMAKE_CXX_FLAGS=${compiler_flags}"
--toolchain "$ENV{VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake"
RESULT_VARIABLE result
)
if (NOT result EQUAL 0)
message(FATAL_ERROR "Bad exit status")
endif()

- name: Build
run: cmake --build build --config ${{ matrix.config }} --parallel
Expand All @@ -39,4 +62,4 @@ jobs:
- name: Publish test report
uses: mikepenz/action-junit-report@v3
with:
report_paths: 'build/bin/junit_*.xml'
report_paths: 'build/junit_*.xml'
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

26 changes: 0 additions & 26 deletions CMakePresets.json

This file was deleted.

1 change: 0 additions & 1 deletion vcpkg
Submodule vcpkg deleted from 6f7ffe
8 changes: 8 additions & 0 deletions vcpkg-configuration.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
"default-registry": {
"kind": "git",
"repository": "https://github.com/microsoft/vcpkg",
"baseline": "c8696863d371ab7f46e213d8f5ca923c4aef2a00"
}
}
Loading