Skip to content

Commit 075ed5a

Browse files
committed
Posix/cygwin/bsd: make cxxstd optional
Add docs built test, thanks to sdarwin
1 parent 0f432ba commit 075ed5a

File tree

1 file changed

+71
-26
lines changed

1 file changed

+71
-26
lines changed

.github/workflows/ci.yml

Lines changed: 71 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ 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+
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "debug-symbols=off")
614614
#Build variant
615615
if [ -n "${{matrix.build_variant}}" ]
616616
then
@@ -655,6 +655,12 @@ jobs:
655655
then
656656
B2_ARGS+=("linkflags=${{matrix.linkflags}}")
657657
fi
658+
#cxxstd
659+
if [ -n "${{matrix.cxxstd}}" ]
660+
then
661+
B2_ARGS+=("cxxstd=${{matrix.cxxstd}}")
662+
fi
663+
658664
B2_ARGS+=("libs/$LIBRARY/test")
659665
./b2 "${B2_ARGS[@]}"
660666
@@ -814,8 +820,7 @@ jobs:
814820
/usr/sbin/cygserver &
815821
sleep 2
816822
cd boost-root
817-
${{matrix.toolset}} --version
818-
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "cxxstd=${{matrix.cxxstd}}" "debug-symbols=off")
823+
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "debug-symbols=off")
819824
#Build variant
820825
if [ -n "${{matrix.build_variant}}" ]
821826
then
@@ -860,6 +865,11 @@ jobs:
860865
then
861866
B2_ARGS+=("linkflags=${{matrix.linkflags}}")
862867
fi
868+
#cxxstd
869+
if [ -n "${{matrix.cxxstd}}" ]
870+
then
871+
B2_ARGS+=("cxxstd=${{matrix.cxxstd}}")
872+
fi
863873
B2_ARGS+=("libs/$LIBRARY/test")
864874
./b2 "${B2_ARGS[@]}"
865875
@@ -910,7 +920,7 @@ jobs:
910920
pwd
911921
ls -la
912922
set -e
913-
923+
914924
# Install required packages
915925
echo "Installing packages..."
916926
if [ "${{matrix.vm}}" == "freebsd" ]
@@ -957,7 +967,6 @@ jobs:
957967
echo BUILD_JOBS: $BUILD_JOBS
958968
DEPINST_ARGS=()
959969
DEPINST_ARGS+=("--git_args" "--jobs $GIT_FETCH_JOBS")
960-
961970
mkdir -p snapshot
962971
cd snapshot
963972
echo "Downloading library snapshot: https://github.com/${GITHUB_REPOSITORY}/archive/${GITHUB_SHA}.tar.gz"
@@ -971,7 +980,6 @@ jobs:
971980
fi
972981
rm -f "${LIBRARY}-${GITHUB_SHA}.tar.gz"
973982
cd ..
974-
975983
git clone -b "$BOOST_BRANCH" --depth 1 "https://github.com/boostorg/boost.git" "boost-root"
976984
cd boost-root
977985
mkdir -p libs
@@ -984,7 +992,6 @@ jobs:
984992
python3 tools/boostdep/depinst/depinst.py "${DEPINST_ARGS[@]}"
985993
./bootstrap.sh
986994
./b2 headers
987-
988995
if [ -n "${{matrix.compiler}}" -o -n "$GCC_TOOLCHAIN_ROOT" ]
989996
then
990997
echo -n "using ${{matrix.toolset}} : : ${{matrix.compiler}}" > ~/user-config.jam
@@ -994,63 +1001,101 @@ jobs:
9941001
fi
9951002
echo " ;" >> ~/user-config.jam
9961003
fi
997-
9981004
# Run tests
999-
${{matrix.toolset}} --version
1000-
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "cxxstd=${{matrix.cxxstd}}" "debug-symbols=off")
1001-
1002-
# Build variant
1005+
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "debug-symbols=off")
1006+
#Build variant
10031007
if [ -n "${{matrix.build_variant}}" ]
10041008
then
10051009
B2_ARGS+=("variant=${{matrix.build_variant}}")
10061010
else
10071011
B2_ARGS+=("variant=$DEFAULT_BUILD_VARIANT")
10081012
fi
1009-
1010-
# Threading
1013+
#Threading
10111014
if [ -n "${{matrix.threading}}" ]
10121015
then
10131016
B2_ARGS+=("threading=${{matrix.threading}}")
10141017
fi
1015-
1016-
# UBSAN options
1018+
#UBSAN options
10171019
if [ -n "${{matrix.ubsan}}" ]
10181020
then
10191021
export UBSAN_OPTIONS="verbosity=1:print_stacktrace=1"
10201022
B2_ARGS+=("undefined-sanitizer=norecover" "define=UBSAN=1")
10211023
fi
1022-
1023-
# ASAN options
1024+
#ASAN options
10241025
if [ -n "${{matrix.asan}}" ]
10251026
then
10261027
export ASAN_OPTIONS="verbosity=1:print_stacktrace=1"
10271028
B2_ARGS+=("address-sanitizer=norecover" "define=ASAN=1")
10281029
fi
1029-
1030-
# Common UBSAN / ASAN options
1030+
#Common UBSAN / ASAN options
10311031
if [ -n "${{matrix.asan}}" ] || [ -n "${{matrix.ubsan}}" ]
10321032
then
10331033
B2_ARGS+=("debug-symbols=on" "visibility=global")
10341034
fi
1035-
1036-
# cxxflags
1035+
#cxxflags
10371036
if [ -n "${{matrix.cxxflags}}" ]
10381037
then
10391038
B2_ARGS+=("cxxflags=${{matrix.cxxflags}}")
10401039
fi
1041-
1042-
# address-model
1040+
#address-model
10431041
if [ -n "${{matrix.address-model}}" ]
10441042
then
10451043
B2_ARGS+=("address-model=${{matrix.address-model}}")
10461044
fi
1047-
1048-
# link-flags
1045+
#link-flags
10491046
if [ -n "${{matrix.linkflags}}" ]
10501047
then
10511048
B2_ARGS+=("linkflags=${{matrix.linkflags}}")
10521049
fi
1050+
#cxxstd
1051+
if [ -n "${{matrix.cxxstd}}" ]
1052+
then
1053+
B2_ARGS+=("cxxstd=${{matrix.cxxstd}}")
1054+
fi
1055+
1056+
B2_ARGS+=("libs/$LIBRARY/test")
1057+
./b2 "${B2_ARGS[@]}"
10531058
10541059
B2_ARGS+=("libs/$LIBRARY/test")
10551060
./b2 "${B2_ARGS[@]}"
10561061
1062+
1063+
docs:
1064+
defaults:
1065+
run:
1066+
shell: bash
1067+
1068+
strategy:
1069+
fail-fast: false
1070+
matrix:
1071+
include:
1072+
- os: ubuntu-latest
1073+
container: cppalliance/boost_superproject_build:24.04-v4
1074+
1075+
timeout-minutes: 240
1076+
runs-on: ${{matrix.os}}
1077+
container: ${{matrix.container}}
1078+
1079+
steps:
1080+
- uses: actions/checkout@v4
1081+
with:
1082+
fetch-depth: 3
1083+
1084+
- name: Git safe.directory
1085+
run: |
1086+
git status || git config --system --add safe.directory "$GITHUB_WORKSPACE"
1087+
1088+
- uses: dorny/paths-filter@v3
1089+
id: changes
1090+
with:
1091+
filters: |
1092+
src:
1093+
- 'doc/**'
1094+
1095+
- if: steps.changes.outputs.src == 'true'
1096+
name: Build docs
1097+
run: |
1098+
set -xe
1099+
curl --retry-all-errors --connect-timeout 15 -sSL --retry 5 -o linuxdocs.sh https://raw.githubusercontent.com/boostorg/release-tools/refs/heads/master/build_docs/linuxdocs.sh
1100+
chmod 755 linuxdocs.sh
1101+
./linuxdocs.sh --skip-packages

0 commit comments

Comments
 (0)