Skip to content

Commit a160430

Browse files
authored
Merge pull request #95 from eseiler/infra/ci
[INFRA] Update CI
2 parents 3211961 + 880d40b commit a160430

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

.github/workflows/ci_coverage.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
compiler: ["gcc-14"]
30+
compiler: ["gcc-latest"]
3131
container:
3232
image: ghcr.io/seqan/${{ matrix.compiler }}
3333
volumes:
@@ -40,8 +40,8 @@ jobs:
4040
run: |
4141
mkdir build && cd build
4242
cmake .. -DCMAKE_BUILD_TYPE=Debug \
43-
-DCMAKE_CXX_FLAGS="--coverage -fprofile-arcs -ftest-coverage -Werror" \
44-
-DCMAKE_C_FLAGS="--coverage -fprofile-arcs -ftest-coverage -Werror" \
43+
-DCMAKE_CXX_FLAGS="--coverage -fprofile-arcs -ftest-coverage -fprofile-abs-path -Werror" \
44+
-DCMAKE_C_FLAGS="--coverage -fprofile-arcs -ftest-coverage -fprofile-abs-path -Werror" \
4545
-DCMAKE_EXE_LINKER_FLAGS="-Wl,-lgcov" \
4646
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,-lgcov"
4747
@@ -55,9 +55,11 @@ jobs:
5555
${GITHUB_WORKSPACE}/build \
5656
--filter ${GITHUB_WORKSPACE}/include \
5757
--filter ${GITHUB_WORKSPACE}/src \
58-
--exclude-unreachable-branches \
59-
--exclude-throw-branches \
58+
--exclude-lines-by-pattern '^\s*}|^\s*};' \
6059
--exclude-noncode-lines \
60+
--exclude-throw-branches \
61+
--exclude-unreachable-branches \
62+
--merge-mode-functions separate \
6163
-j \
6264
--cobertura \
6365
--output ${GITHUB_WORKSPACE}/build/coverage_report.xml

.github/workflows/ci_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
compiler: ["clang-19", "clang-18", "clang-17", "gcc-14", "gcc-13", "gcc-12", "intel"]
30+
compiler: ["clang-latest", "clang-second-latest", "clang-third-latest", "gcc-latest", "gcc-second-latest", "gcc-third-latest", "intel"]
3131
include:
3232
- compiler: "intel"
3333
cxx_flags: "-fp-model=strict -Wno-overriding-option"

.github/workflows/ci_macos.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
compiler: ["clang-19", "clang-18", "clang-17", "gcc-14", "gcc-13", "gcc-12"]
30+
compiler: ["clang-latest", "clang-second-latest", "clang-third-latest", "gcc-latest", "gcc-second-latest", "gcc-third-latest"]
3131
steps:
3232
- name: Checkout
3333
uses: actions/checkout@v4
@@ -37,12 +37,6 @@ jobs:
3737
with:
3838
compiler: ${{ matrix.compiler }}
3939

40-
- name: Patch M1 GCC
41-
if: contains(matrix.compiler, 'gcc') && matrix.compiler != 'gcc-14'
42-
uses: seqan/actions/patch-m1-gcc@main
43-
with:
44-
compiler: ${{ matrix.compiler }}
45-
4640
- name: Configure tests
4741
run: |
4842
mkdir build && cd build

cmake/package-lock.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ CPMDeclarePackage (sharg
2424
GITHUB_REPOSITORY seqan/sharg-parser
2525
SYSTEM TRUE
2626
EXCLUDE_FROM_ALL TRUE
27-
OPTIONS "INSTALL_SHARG OFF" "INSTALL_TDL OFF" "CMAKE_MESSAGE_LOG_LEVEL WARNING"
27+
OPTIONS "INSTALL_SHARG OFF" "INSTALL_TDL OFF" "CMAKE_MESSAGE_LOG_LEVEL WARNING" "SHARG_NO_TDL ON"
2828
)
2929

3030
# seqan3

0 commit comments

Comments
 (0)