Skip to content

Commit 8ca4a03

Browse files
authored
Merge pull request #573 from biojppm/ci/disable_coverage_32bit_dbg
disable ci test for RYML_DBG 32 bit test: test in gcc
2 parents c1d0047 + 18f106d commit 8ca4a03

File tree

4 files changed

+161
-17
lines changed

4 files changed

+161
-17
lines changed

.github/workflows/coverage.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ jobs:
4343
- std: 11
4444
namesfx: 32bit
4545
cmk: -DCMAKE_CXX_FLAGS=-m32
46-
- std: 11
47-
namesfx: 32bit_dbg
48-
cmk: -DCMAKE_CXX_FLAGS=-m32 -DRYML_DBG=ON
4946
env:
5047
GCC_VERSION: 13
5148
LCOV_ARGS: -v --ignore-errors mismatch,mismatch --ignore-errors unused,unused
@@ -59,17 +56,22 @@ jobs:
5956
fetch-depth: 0
6057
- name: install compiler
6158
run: |
62-
sudo dpkg --add-architecture i386
59+
if [[ ${{matrix}} == *"32"* ]] ; then
60+
sudo dpkg --add-architecture i386
61+
fi
6362
sudo apt-get update
63+
if [[ ${{matrix}} == *"32"* ]] ; then
64+
sudo apt-get install -y \
65+
linux-libc-dev:i386 \
66+
libc6:i386 \
67+
libc6-dev:i386 \
68+
libc6-dbg:i386
69+
fi
6470
sudo apt-get install -y \
6571
build-essential \
6672
cmake \
6773
git \
6874
lcov \
69-
linux-libc-dev:i386 \
70-
libc6:i386 \
71-
libc6-dev:i386 \
72-
libc6-dbg:i386 \
7375
g++-$GCC_VERSION \
7476
g++-$GCC_VERSION-multilib
7577
- name: show info

.github/workflows/coverage.ys

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- {std: 11, namesfx: 64bit_exc , cmk: "-DCMAKE_CXX_FLAGS='-m64' -DRYML_DEFAULT_CALLBACK_USES_EXCEPTIONS=ON"}
1919
- {std: 11, namesfx: 64bit_dbg , cmk: "-DCMAKE_CXX_FLAGS=-m64 -DRYML_DBG=ON"}
2020
- {std: 11, namesfx: 32bit , cmk: "-DCMAKE_CXX_FLAGS=-m32"}
21-
- {std: 11, namesfx: 32bit_dbg , cmk: "-DCMAKE_CXX_FLAGS=-m32 -DRYML_DBG=ON"}
21+
#- {std: 11, namesfx: 32bit_dbg , cmk: "-DCMAKE_CXX_FLAGS=-m32 -DRYML_DBG=ON"}
2222
env:
2323
GCC_VERSION: 13 # the default compiler
2424
LCOV_ARGS: -v --ignore-errors mismatch,mismatch --ignore-errors unused,unused
@@ -28,17 +28,22 @@ jobs:
2828
- :: checkout-action
2929
- name: install compiler
3030
run: |
31-
sudo dpkg --add-architecture i386
31+
if [[ ${{matrix}} == *"32"* ]] ; then
32+
sudo dpkg --add-architecture i386
33+
fi
3234
sudo apt-get update
35+
if [[ ${{matrix}} == *"32"* ]] ; then
36+
sudo apt-get install -y \
37+
linux-libc-dev:i386 \
38+
libc6:i386 \
39+
libc6-dev:i386 \
40+
libc6-dbg:i386
41+
fi
3342
sudo apt-get install -y \
3443
build-essential \
3544
cmake \
3645
git \
3746
lcov \
38-
linux-libc-dev:i386 \
39-
libc6:i386 \
40-
libc6-dev:i386 \
41-
libc6-dbg:i386 \
4247
g++-$GCC_VERSION \
4348
g++-$GCC_VERSION-multilib
4449
- name: show info

.github/workflows/gcc.yml

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,101 @@ jobs:
452452
run: source .github/setenv.sh && c4_run_test shared32
453453
- name: shared32-pack
454454
run: source .github/setenv.sh && c4_package shared32
455+
dbg:
456+
if: always()
457+
continue-on-error: false
458+
name: dbg/${{matrix.name}}/${{matrix.gcc}}
459+
runs-on: ubuntu-24.04
460+
container: ghcr.io/biojppm/c4core/ubuntu${{matrix.img}}:latest
461+
needs: canary
462+
strategy:
463+
fail-fast: false
464+
matrix:
465+
include:
466+
- name: 64bit_g
467+
std: 11
468+
gcc: 13
469+
bt: Debug
470+
img: 22.04
471+
cxxflags: null
472+
- name: 64bit_O1
473+
std: 11
474+
gcc: 13
475+
bt: Release
476+
img: 22.04
477+
cxxflags: -O1 -DNDEBUG
478+
- name: 64bit_O2
479+
std: 11
480+
gcc: 13
481+
bt: Release
482+
img: 22.04
483+
cxxflags: -O2 -DNDEBUG
484+
- name: 64bit_O3
485+
std: 11
486+
gcc: 13
487+
bt: Release
488+
img: 22.04
489+
cxxflags: -O3 -DNDEBUG
490+
- name: 32bit_g
491+
std: 11
492+
gcc: 13
493+
bt: Debug
494+
img: 22.04
495+
cxxflags: -m32
496+
- name: 32bit_O1
497+
std: 11
498+
gcc: 13
499+
bt: Release
500+
img: 22.04
501+
cxxflags: -m32 -O1 -DNDEBUG
502+
- name: 32bit_O2
503+
std: 11
504+
gcc: 13
505+
bt: Release
506+
img: 22.04
507+
cxxflags: -m32 -O2 -DNDEBUG
508+
- name: 32bit_O3
509+
std: 11
510+
gcc: 13
511+
bt: Release
512+
img: 22.04
513+
cxxflags: -m32 -O3 -DNDEBUG
514+
env:
515+
STD: ${{matrix.std}}
516+
CXX_: ${{matrix.gcc}}
517+
BT: ${{matrix.bt}}
518+
BITLINKS: ${{matrix.bitlinks}}
519+
VG: ${{matrix.vg}}
520+
SAN: ${{matrix.san}}
521+
LINT: ${{matrix.lint}}
522+
OS: ${{matrix.os}}
523+
steps:
524+
- name: checkout (action + docker)
525+
uses: actions/checkout@v4
526+
with:
527+
submodules: recursive
528+
fetch-depth: 0
529+
- run: git config --system --add safe.directory '*'
530+
- run: c4core-install g++-${{matrix.gcc}}
531+
- name: show info
532+
run: source .github/setenv.sh && c4_show_info
533+
- name: configure (issue \#${{matrix.issue}})
534+
run: |
535+
cmake -S . -B build \
536+
-DCMAKE_CXX_COMPILER=g++-${{matrix.gcc}} \
537+
-DCMAKE_C_COMPILER=gcc-${{matrix.gcc}} \
538+
-DCMAKE_BUILD_TYPE=Release \
539+
-DCMAKE_CXX_FLAGS_DEBUG="${{matrix.cxxflags}}" \
540+
-DCMAKE_CXX_FLAGS_RELEASE="${{matrix.cxxflags}}" \
541+
-DRYML_BUILD_TESTS=ON \
542+
-DRYML_DBG=ON
543+
- name: build (issue \#${{matrix.issue}})
544+
run: cmake --build build --target ryml-test-build --parallel --verbose
545+
- name: run (issue \#${{matrix.issue}})
546+
run: |
547+
source .github/setenv.sh
548+
export CTEST_PARALLEL_LEVEL=`_c4getnumcores`
549+
cmake --build build --target ryml-test-run
455550
misbuild:
456551
if: always()
457552
continue-on-error: false

.github/workflows/gcc.ys

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
item =: \({:std %1, :cxx "g++-$a(%2)", :bt %3, :bitlinks 'shared64 static32', :img "$a(%4)"})
1717
include: &include1
18-
# use gcc13 because it's a lot faster than gcc14
18+
# for canary use gcc13 because it's a lot faster than gcc14
1919
- ! item(11 13 'Debug' '22.04')
2020
- ! item(11 13 'Release' '22.04')
2121
- ! item(20 13 'Debug' '22.04')
@@ -53,6 +53,48 @@ jobs:
5353
env:: load('share/env.yaml') + {'CXXFLAGS' '-fno-exceptions -fno-rtti'}
5454
steps:: checkout-manual + install-cxx + run-steps
5555

56+
#----------------------------------------------------------------------------
57+
dbg:
58+
:: setup-job('gcc' 'dbg')
59+
name: dbg/${{matrix.name}}/${{matrix.gcc}}
60+
:: runs-on-docker-c4core('${{matrix.img}}')
61+
needs: canary
62+
strategy:
63+
fail-fast: false
64+
matrix:
65+
include:
66+
- {name: 64bit_g , std: 11, gcc: 13 , bt: Debug , img: 22.04, cxxflags: }
67+
- {name: 64bit_O1, std: 11, gcc: 13 , bt: Release, img: 22.04, cxxflags: -O1 -DNDEBUG}
68+
- {name: 64bit_O2, std: 11, gcc: 13 , bt: Release, img: 22.04, cxxflags: -O2 -DNDEBUG}
69+
- {name: 64bit_O3, std: 11, gcc: 13 , bt: Release, img: 22.04, cxxflags: -O3 -DNDEBUG}
70+
- {name: 32bit_g , std: 11, gcc: 13 , bt: Debug , img: 22.04, cxxflags: -m32 }
71+
- {name: 32bit_O1, std: 11, gcc: 13 , bt: Release, img: 22.04, cxxflags: -m32 -O1 -DNDEBUG}
72+
- {name: 32bit_O2, std: 11, gcc: 13 , bt: Release, img: 22.04, cxxflags: -m32 -O2 -DNDEBUG}
73+
- {name: 32bit_O3, std: 11, gcc: 13 , bt: Release, img: 22.04, cxxflags: -m32 -O3 -DNDEBUG}
74+
env:: load('share/env.yaml') + {'CXX_' '${{matrix.gcc}}'}
75+
steps:
76+
- :: checkout-action-docker
77+
- run: c4core-install g++-${{matrix.gcc}}
78+
- name: show info
79+
run: source .github/setenv.sh && c4_show_info
80+
- name: configure (issue \#${{matrix.issue}})
81+
run: |
82+
cmake -S . -B build \
83+
-DCMAKE_CXX_COMPILER=g++-${{matrix.gcc}} \
84+
-DCMAKE_C_COMPILER=gcc-${{matrix.gcc}} \
85+
-DCMAKE_BUILD_TYPE=Release \
86+
-DCMAKE_CXX_FLAGS_DEBUG="${{matrix.cxxflags}}" \
87+
-DCMAKE_CXX_FLAGS_RELEASE="${{matrix.cxxflags}}" \
88+
-DRYML_BUILD_TESTS=ON \
89+
-DRYML_DBG=ON
90+
- name: build (issue \#${{matrix.issue}})
91+
run: cmake --build build --target ryml-test-build --parallel --verbose
92+
- name: run (issue \#${{matrix.issue}})
93+
run: |
94+
source .github/setenv.sh
95+
export CTEST_PARALLEL_LEVEL=`_c4getnumcores`
96+
cmake --build build --target ryml-test-run
97+
5698
#----------------------------------------------------------------------------
5799
misbuild:
58100
:: setup-job('gcc' 'misbuild')
@@ -89,7 +131,7 @@ jobs:
89131
cmake --build build --target ryml-test-run
90132

91133
#----------------------------------------------------------------------------
92-
# with valgrind too slow: only latest gcc
134+
# with valgrind: it's too slow; only latest gcc
93135

94136
strategy-latest-gcc =::
95137
fail-fast: false
@@ -104,6 +146,7 @@ jobs:
104146
- {std: 11, cxx: 14, bits: 64, vg: ON , img: 22.04}
105147
- {std: 11, cxx: 14, bits: 32, vg: ON , img: 22.04}
106148

149+
# split these two valgrind jobs to make them faster
107150
vg1:
108151
:: setup-job('gcc' 'vg1')
109152
name: extended/${{matrix.cxx}}/${{matrix.bits}}bit/c++${{matrix.std}}/vg/D_O1_O2
@@ -118,7 +161,6 @@ jobs:
118161
- :: run-gcc-manual-with-flags('Debug' '-m${{matrix.bits}}')
119162
- :: run-gcc-manual-with-flags('Release' '-O1 -DNDEBUG -m${{matrix.bits}}')
120163
- :: run-gcc-manual-with-flags('Release' '-O2 -DNDEBUG -m${{matrix.bits}}')
121-
122164
vg2:
123165
:: setup-job('gcc' 'vg2')
124166
name: extended/${{matrix.cxx}}/${{matrix.bits}}bit/c++${{matrix.std}}/vg/O3_Os

0 commit comments

Comments
 (0)