Skip to content

Commit 0d2dff8

Browse files
committed
Print compiler version and make cxxstd an option
1 parent 5c3e6a0 commit 0d2dff8

File tree

1 file changed

+32
-24
lines changed

1 file changed

+32
-24
lines changed

.github/workflows/ci.yml

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,8 @@ jobs:
610610
if: matrix.cmake_tests == ''
611611
run: |
612612
cd boost-root
613-
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "cxxstd=${{matrix.cxxstd}}" "debug-symbols=off")
613+
${{matrix.toolset}} --version
614+
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "debug-symbols=off")
614615
#Build variant
615616
if [ -n "${{matrix.build_variant}}" ]
616617
then
@@ -655,6 +656,12 @@ jobs:
655656
then
656657
B2_ARGS+=("linkflags=${{matrix.linkflags}}")
657658
fi
659+
#cxxstd
660+
if [ -n "${{matrix.cxxstd}}" ]
661+
then
662+
B2_ARGS+=("cxxstd=${{matrix.cxxstd}}")
663+
fi
664+
658665
B2_ARGS+=("libs/$LIBRARY/test")
659666
./b2 "${B2_ARGS[@]}"
660667
@@ -815,7 +822,7 @@ jobs:
815822
sleep 2
816823
cd boost-root
817824
${{matrix.toolset}} --version
818-
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "cxxstd=${{matrix.cxxstd}}" "debug-symbols=off")
825+
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "debug-symbols=off")
819826
#Build variant
820827
if [ -n "${{matrix.build_variant}}" ]
821828
then
@@ -860,6 +867,11 @@ jobs:
860867
then
861868
B2_ARGS+=("linkflags=${{matrix.linkflags}}")
862869
fi
870+
#cxxstd
871+
if [ -n "${{matrix.cxxstd}}" ]
872+
then
873+
B2_ARGS+=("cxxstd=${{matrix.cxxstd}}")
874+
fi
863875
B2_ARGS+=("libs/$LIBRARY/test")
864876
./b2 "${B2_ARGS[@]}"
865877
@@ -910,7 +922,7 @@ jobs:
910922
pwd
911923
ls -la
912924
set -e
913-
925+
914926
# Install required packages
915927
echo "Installing packages..."
916928
if [ "${{matrix.vm}}" == "freebsd" ]
@@ -957,7 +969,6 @@ jobs:
957969
echo BUILD_JOBS: $BUILD_JOBS
958970
DEPINST_ARGS=()
959971
DEPINST_ARGS+=("--git_args" "--jobs $GIT_FETCH_JOBS")
960-
961972
mkdir -p snapshot
962973
cd snapshot
963974
echo "Downloading library snapshot: https://github.com/${GITHUB_REPOSITORY}/archive/${GITHUB_SHA}.tar.gz"
@@ -971,7 +982,6 @@ jobs:
971982
fi
972983
rm -f "${LIBRARY}-${GITHUB_SHA}.tar.gz"
973984
cd ..
974-
975985
git clone -b "$BOOST_BRANCH" --depth 1 "https://github.com/boostorg/boost.git" "boost-root"
976986
cd boost-root
977987
mkdir -p libs
@@ -984,7 +994,6 @@ jobs:
984994
python3 tools/boostdep/depinst/depinst.py "${DEPINST_ARGS[@]}"
985995
./bootstrap.sh
986996
./b2 headers
987-
988997
if [ -n "${{matrix.compiler}}" -o -n "$GCC_TOOLCHAIN_ROOT" ]
989998
then
990999
echo -n "using ${{matrix.toolset}} : : ${{matrix.compiler}}" > ~/user-config.jam
@@ -994,62 +1003,61 @@ jobs:
9941003
fi
9951004
echo " ;" >> ~/user-config.jam
9961005
fi
997-
9981006
# Run tests
9991007
${{matrix.toolset}} --version
1000-
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "cxxstd=${{matrix.cxxstd}}" "debug-symbols=off")
1001-
1002-
# Build variant
1008+
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "debug-symbols=off")
1009+
#Build variant
10031010
if [ -n "${{matrix.build_variant}}" ]
10041011
then
10051012
B2_ARGS+=("variant=${{matrix.build_variant}}")
10061013
else
10071014
B2_ARGS+=("variant=$DEFAULT_BUILD_VARIANT")
10081015
fi
1009-
1010-
# Threading
1016+
#Threading
10111017
if [ -n "${{matrix.threading}}" ]
10121018
then
10131019
B2_ARGS+=("threading=${{matrix.threading}}")
10141020
fi
1015-
1016-
# UBSAN options
1021+
#UBSAN options
10171022
if [ -n "${{matrix.ubsan}}" ]
10181023
then
10191024
export UBSAN_OPTIONS="verbosity=1:print_stacktrace=1"
10201025
B2_ARGS+=("undefined-sanitizer=norecover" "define=UBSAN=1")
10211026
fi
1022-
1023-
# ASAN options
1027+
#ASAN options
10241028
if [ -n "${{matrix.asan}}" ]
10251029
then
10261030
export ASAN_OPTIONS="verbosity=1:print_stacktrace=1"
10271031
B2_ARGS+=("address-sanitizer=norecover" "define=ASAN=1")
10281032
fi
1029-
1030-
# Common UBSAN / ASAN options
1033+
#Common UBSAN / ASAN options
10311034
if [ -n "${{matrix.asan}}" ] || [ -n "${{matrix.ubsan}}" ]
10321035
then
10331036
B2_ARGS+=("debug-symbols=on" "visibility=global")
10341037
fi
1035-
1036-
# cxxflags
1038+
#cxxflags
10371039
if [ -n "${{matrix.cxxflags}}" ]
10381040
then
10391041
B2_ARGS+=("cxxflags=${{matrix.cxxflags}}")
10401042
fi
1041-
1042-
# address-model
1043+
#address-model
10431044
if [ -n "${{matrix.address-model}}" ]
10441045
then
10451046
B2_ARGS+=("address-model=${{matrix.address-model}}")
10461047
fi
1047-
1048-
# link-flags
1048+
#link-flags
10491049
if [ -n "${{matrix.linkflags}}" ]
10501050
then
10511051
B2_ARGS+=("linkflags=${{matrix.linkflags}}")
10521052
fi
1053+
#cxxstd
1054+
if [ -n "${{matrix.cxxstd}}" ]
1055+
then
1056+
B2_ARGS+=("cxxstd=${{matrix.cxxstd}}")
1057+
fi
1058+
1059+
B2_ARGS+=("libs/$LIBRARY/test")
1060+
./b2 "${B2_ARGS[@]}"
10531061
10541062
B2_ARGS+=("libs/$LIBRARY/test")
10551063
./b2 "${B2_ARGS[@]}"

0 commit comments

Comments
 (0)