mirror of
https://github.com/boostorg/container.git
synced 2026-01-19 04:02:17 +00:00
Print compiler version and make cxxstd an option
This commit is contained in:
56
.github/workflows/ci.yml
vendored
56
.github/workflows/ci.yml
vendored
@@ -610,7 +610,8 @@ jobs:
|
|||||||
if: matrix.cmake_tests == ''
|
if: matrix.cmake_tests == ''
|
||||||
run: |
|
run: |
|
||||||
cd boost-root
|
cd boost-root
|
||||||
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "cxxstd=${{matrix.cxxstd}}" "debug-symbols=off")
|
${{matrix.toolset}} --version
|
||||||
|
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "debug-symbols=off")
|
||||||
#Build variant
|
#Build variant
|
||||||
if [ -n "${{matrix.build_variant}}" ]
|
if [ -n "${{matrix.build_variant}}" ]
|
||||||
then
|
then
|
||||||
@@ -655,6 +656,12 @@ jobs:
|
|||||||
then
|
then
|
||||||
B2_ARGS+=("linkflags=${{matrix.linkflags}}")
|
B2_ARGS+=("linkflags=${{matrix.linkflags}}")
|
||||||
fi
|
fi
|
||||||
|
#cxxstd
|
||||||
|
if [ -n "${{matrix.cxxstd}}" ]
|
||||||
|
then
|
||||||
|
B2_ARGS+=("cxxstd=${{matrix.cxxstd}}")
|
||||||
|
fi
|
||||||
|
|
||||||
B2_ARGS+=("libs/$LIBRARY/test")
|
B2_ARGS+=("libs/$LIBRARY/test")
|
||||||
./b2 "${B2_ARGS[@]}"
|
./b2 "${B2_ARGS[@]}"
|
||||||
|
|
||||||
@@ -815,7 +822,7 @@ jobs:
|
|||||||
sleep 2
|
sleep 2
|
||||||
cd boost-root
|
cd boost-root
|
||||||
${{matrix.toolset}} --version
|
${{matrix.toolset}} --version
|
||||||
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "cxxstd=${{matrix.cxxstd}}" "debug-symbols=off")
|
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "debug-symbols=off")
|
||||||
#Build variant
|
#Build variant
|
||||||
if [ -n "${{matrix.build_variant}}" ]
|
if [ -n "${{matrix.build_variant}}" ]
|
||||||
then
|
then
|
||||||
@@ -860,6 +867,11 @@ jobs:
|
|||||||
then
|
then
|
||||||
B2_ARGS+=("linkflags=${{matrix.linkflags}}")
|
B2_ARGS+=("linkflags=${{matrix.linkflags}}")
|
||||||
fi
|
fi
|
||||||
|
#cxxstd
|
||||||
|
if [ -n "${{matrix.cxxstd}}" ]
|
||||||
|
then
|
||||||
|
B2_ARGS+=("cxxstd=${{matrix.cxxstd}}")
|
||||||
|
fi
|
||||||
B2_ARGS+=("libs/$LIBRARY/test")
|
B2_ARGS+=("libs/$LIBRARY/test")
|
||||||
./b2 "${B2_ARGS[@]}"
|
./b2 "${B2_ARGS[@]}"
|
||||||
|
|
||||||
@@ -910,7 +922,7 @@ jobs:
|
|||||||
pwd
|
pwd
|
||||||
ls -la
|
ls -la
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# Install required packages
|
# Install required packages
|
||||||
echo "Installing packages..."
|
echo "Installing packages..."
|
||||||
if [ "${{matrix.vm}}" == "freebsd" ]
|
if [ "${{matrix.vm}}" == "freebsd" ]
|
||||||
@@ -957,7 +969,6 @@ jobs:
|
|||||||
echo BUILD_JOBS: $BUILD_JOBS
|
echo BUILD_JOBS: $BUILD_JOBS
|
||||||
DEPINST_ARGS=()
|
DEPINST_ARGS=()
|
||||||
DEPINST_ARGS+=("--git_args" "--jobs $GIT_FETCH_JOBS")
|
DEPINST_ARGS+=("--git_args" "--jobs $GIT_FETCH_JOBS")
|
||||||
|
|
||||||
mkdir -p snapshot
|
mkdir -p snapshot
|
||||||
cd snapshot
|
cd snapshot
|
||||||
echo "Downloading library snapshot: https://github.com/${GITHUB_REPOSITORY}/archive/${GITHUB_SHA}.tar.gz"
|
echo "Downloading library snapshot: https://github.com/${GITHUB_REPOSITORY}/archive/${GITHUB_SHA}.tar.gz"
|
||||||
@@ -971,7 +982,6 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
rm -f "${LIBRARY}-${GITHUB_SHA}.tar.gz"
|
rm -f "${LIBRARY}-${GITHUB_SHA}.tar.gz"
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
git clone -b "$BOOST_BRANCH" --depth 1 "https://github.com/boostorg/boost.git" "boost-root"
|
git clone -b "$BOOST_BRANCH" --depth 1 "https://github.com/boostorg/boost.git" "boost-root"
|
||||||
cd boost-root
|
cd boost-root
|
||||||
mkdir -p libs
|
mkdir -p libs
|
||||||
@@ -984,7 +994,6 @@ jobs:
|
|||||||
python3 tools/boostdep/depinst/depinst.py "${DEPINST_ARGS[@]}"
|
python3 tools/boostdep/depinst/depinst.py "${DEPINST_ARGS[@]}"
|
||||||
./bootstrap.sh
|
./bootstrap.sh
|
||||||
./b2 headers
|
./b2 headers
|
||||||
|
|
||||||
if [ -n "${{matrix.compiler}}" -o -n "$GCC_TOOLCHAIN_ROOT" ]
|
if [ -n "${{matrix.compiler}}" -o -n "$GCC_TOOLCHAIN_ROOT" ]
|
||||||
then
|
then
|
||||||
echo -n "using ${{matrix.toolset}} : : ${{matrix.compiler}}" > ~/user-config.jam
|
echo -n "using ${{matrix.toolset}} : : ${{matrix.compiler}}" > ~/user-config.jam
|
||||||
@@ -994,62 +1003,61 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
echo " ;" >> ~/user-config.jam
|
echo " ;" >> ~/user-config.jam
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Run tests
|
# Run tests
|
||||||
${{matrix.toolset}} --version
|
${{matrix.toolset}} --version
|
||||||
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "cxxstd=${{matrix.cxxstd}}" "debug-symbols=off")
|
B2_ARGS=("-j" "$BUILD_JOBS" "toolset=${{matrix.toolset}}" "debug-symbols=off")
|
||||||
|
#Build variant
|
||||||
# Build variant
|
|
||||||
if [ -n "${{matrix.build_variant}}" ]
|
if [ -n "${{matrix.build_variant}}" ]
|
||||||
then
|
then
|
||||||
B2_ARGS+=("variant=${{matrix.build_variant}}")
|
B2_ARGS+=("variant=${{matrix.build_variant}}")
|
||||||
else
|
else
|
||||||
B2_ARGS+=("variant=$DEFAULT_BUILD_VARIANT")
|
B2_ARGS+=("variant=$DEFAULT_BUILD_VARIANT")
|
||||||
fi
|
fi
|
||||||
|
#Threading
|
||||||
# Threading
|
|
||||||
if [ -n "${{matrix.threading}}" ]
|
if [ -n "${{matrix.threading}}" ]
|
||||||
then
|
then
|
||||||
B2_ARGS+=("threading=${{matrix.threading}}")
|
B2_ARGS+=("threading=${{matrix.threading}}")
|
||||||
fi
|
fi
|
||||||
|
#UBSAN options
|
||||||
# UBSAN options
|
|
||||||
if [ -n "${{matrix.ubsan}}" ]
|
if [ -n "${{matrix.ubsan}}" ]
|
||||||
then
|
then
|
||||||
export UBSAN_OPTIONS="verbosity=1:print_stacktrace=1"
|
export UBSAN_OPTIONS="verbosity=1:print_stacktrace=1"
|
||||||
B2_ARGS+=("undefined-sanitizer=norecover" "define=UBSAN=1")
|
B2_ARGS+=("undefined-sanitizer=norecover" "define=UBSAN=1")
|
||||||
fi
|
fi
|
||||||
|
#ASAN options
|
||||||
# ASAN options
|
|
||||||
if [ -n "${{matrix.asan}}" ]
|
if [ -n "${{matrix.asan}}" ]
|
||||||
then
|
then
|
||||||
export ASAN_OPTIONS="verbosity=1:print_stacktrace=1"
|
export ASAN_OPTIONS="verbosity=1:print_stacktrace=1"
|
||||||
B2_ARGS+=("address-sanitizer=norecover" "define=ASAN=1")
|
B2_ARGS+=("address-sanitizer=norecover" "define=ASAN=1")
|
||||||
fi
|
fi
|
||||||
|
#Common UBSAN / ASAN options
|
||||||
# Common UBSAN / ASAN options
|
|
||||||
if [ -n "${{matrix.asan}}" ] || [ -n "${{matrix.ubsan}}" ]
|
if [ -n "${{matrix.asan}}" ] || [ -n "${{matrix.ubsan}}" ]
|
||||||
then
|
then
|
||||||
B2_ARGS+=("debug-symbols=on" "visibility=global")
|
B2_ARGS+=("debug-symbols=on" "visibility=global")
|
||||||
fi
|
fi
|
||||||
|
#cxxflags
|
||||||
# cxxflags
|
|
||||||
if [ -n "${{matrix.cxxflags}}" ]
|
if [ -n "${{matrix.cxxflags}}" ]
|
||||||
then
|
then
|
||||||
B2_ARGS+=("cxxflags=${{matrix.cxxflags}}")
|
B2_ARGS+=("cxxflags=${{matrix.cxxflags}}")
|
||||||
fi
|
fi
|
||||||
|
#address-model
|
||||||
# address-model
|
|
||||||
if [ -n "${{matrix.address-model}}" ]
|
if [ -n "${{matrix.address-model}}" ]
|
||||||
then
|
then
|
||||||
B2_ARGS+=("address-model=${{matrix.address-model}}")
|
B2_ARGS+=("address-model=${{matrix.address-model}}")
|
||||||
fi
|
fi
|
||||||
|
#link-flags
|
||||||
# link-flags
|
|
||||||
if [ -n "${{matrix.linkflags}}" ]
|
if [ -n "${{matrix.linkflags}}" ]
|
||||||
then
|
then
|
||||||
B2_ARGS+=("linkflags=${{matrix.linkflags}}")
|
B2_ARGS+=("linkflags=${{matrix.linkflags}}")
|
||||||
fi
|
fi
|
||||||
|
#cxxstd
|
||||||
|
if [ -n "${{matrix.cxxstd}}" ]
|
||||||
|
then
|
||||||
|
B2_ARGS+=("cxxstd=${{matrix.cxxstd}}")
|
||||||
|
fi
|
||||||
|
|
||||||
|
B2_ARGS+=("libs/$LIBRARY/test")
|
||||||
|
./b2 "${B2_ARGS[@]}"
|
||||||
|
|
||||||
B2_ARGS+=("libs/$LIBRARY/test")
|
B2_ARGS+=("libs/$LIBRARY/test")
|
||||||
./b2 "${B2_ARGS[@]}"
|
./b2 "${B2_ARGS[@]}"
|
||||||
|
|||||||
Reference in New Issue
Block a user