StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

update travis usage and build description, and change inclusion matrix to allow for more failures

Browse Source
This commit is contained in:
ThePhD 2018-01-08 09:06:03 -05:00
parent 866ff08165
commit a98e0633ce
4 changed files with 77 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
.travis.yml
View File

@ -33,72 +33,85 @@ before_install:
- sudo apt install -y git
script:
- export SOL2_DIR=${TRAVIS_BUILD_DIR}
- sudo docker image pull ThePhD/sol2:gcc-${GCC_VERSION}_llvm-${LLVM_VERSION}
- sudo docker run --rm --tty --name "sol2.test" --env "CI=${CI}" --env "LUA_VERSION=${LUA_VERSION}" --env "GCC_VERSION=${GCC_VERSION}" --env "LLVM_VERSION=${LLVM_VERSION}" sol2:gcc-${GCC_VERSION}_llvm-${LLVM_VERSION}
- sudo docker run --rm --interactive --tty --name "sol2.test" -v "${SOL2_DIR}:/root/sol2" --env "CI=${CI}" --env "LUA_VERSION=${LUA_VERSION}" --env "GCC_VERSION=${GCC_VERSION}" --env "LLVM_VERSION=${LLVM_VERSION}" thephd/sol2:gcc-${GCC_VERSION}_llvm-${LLVM_VERSION}
- sudo docker rm $(sudo docker ps -a -q)
- sudo docker rmi $(sudo docker image ls -q)
env:
# GCC 4.9.x, 5.x, 6.x, 7.x
- LUA_VERSION=5.3.4
GCC_VERSION=4.9
CI=true
- LUA_VERSION=5.3.4
GCC_VERSION=5
CI=true
- LUA_VERSION=5.3.4
GCC_VERSION=6
CI=true
- LUA_VERSION=5.3.4
GCC_VERSION=7
CI=true
# LLVM 3.6.x -> 5.0.x
- LUA_VERSION=5.3.4
LLVM_VERSION=3.6.2
CI=true
ALLOW_FAILURE=true
- LUA_VERSION=5.3.4
LLVM_VERSION=3.7.1
CI=true
ALLOW_FAILURE=true
- LUA_VERSION=5.3.4
LLVM_VERSION=3.8.1
CI=true
ALLOW_FAILURE=true
- LUA_VERSION=5.3.4
LLVM_VERSION=3.9.1
CI=true
ALLOW_FAILURE=true
- LUA_VERSION=5.3.4
LLVM_VERSION=4.0.1
CI=true
ALLOW_FAILURE=true
- LUA_VERSION=5.3.4
LLVM_VERSION=5.0.1
CI=true
ALLOW_FAILURE=true
# Lua Versions 5.2.4, 5.1.5, and maybe LuaJIT (as well as x86)
- LUA_VERSION=5.2.4
GCC_VERSION=7
CI=true
- LUA_VERSION=5.1.5
GCC_VERSION=7
CI=true
matrix:
fast_finish: true
allow_failures:
- env: ALLOW_FAILURE=true
include:
# GCC 4.9.x, 5.x, 6.x, 7.x
- env:
- LUA_VERSION=5.3.4
GCC_VERSION=4.9
CI=true
- env:
- LUA_VERSION=5.3.4
GCC_VERSION=5
CI=true
- env:
- LUA_VERSION=5.3.4
GCC_VERSION=6
CI=true
- env:
- LUA_VERSION=5.3.4
GCC_VERSION=7
CI=true
# LLVM 3.6.x -> 5.0.x
- env:
- LUA_VERSION=5.3.4
LLVM_VERSION=3.6.2
CI=true
ALLOW_FAILURE=true
- env:
- LUA_VERSION=5.3.4
LLVM_VERSION=3.7.1
CI=true
ALLOW_FAILURE=true
- env:
- LUA_VERSION=5.3.4
LLVM_VERSION=3.8.1
CI=true
ALLOW_FAILURE=true
- env:
- LUA_VERSION=5.3.4
LLVM_VERSION=3.9.1
CI=true
ALLOW_FAILURE=true
- env:
- LUA_VERSION=5.3.4
LLVM_VERSION=4.0.1
CI=true
ALLOW_FAILURE=true
- env:
- LUA_VERSION=5.3.4
LLVM_VERSION=5.0.1
CI=true
ALLOW_FAILURE=true
# Lua Versions 5.2.4, 5.1.5, and maybe LuaJIT (as well as x86)
- env:
- LUA_VERSION=5.2.4
GCC_VERSION=7
CI=true
- env:
- LUA_VERSION=5.1.5
GCC_VERSION=7
CI=true
notifications:
webhooks:

2
examples/CMakeLists.txt
View File

@ -86,7 +86,7 @@ foreach(example_source_file ${EXAMPLES_SRC})
MAKE_EXAMPLE(${example_source_file} FALSE)
endforeach()
if (EXAMPLES_SINGLE AND SOL2_SINGLE_FOUND)
if (SOL2_SINGLE_FOUND AND EXAMPLES_SINGLE)
foreach(example_source_file ${EXAMPLES_SRC})
MAKE_EXAMPLE(${example_source_file} TRUE)
endforeach()

3
scripts/preparation.linux.sh
View File

@ -80,6 +80,7 @@ then
# use || true to ignore potential failures
ln -s "clang-${major}.${minor}" "${CLANG_PREFIX}/bin/clang-${major}.${minor}" || true
ln -s "clang-${major}.${minor}" "${CLANG_PREFIX}/bin/clang++-${major}.${minor}" || true
rm -f "${LLVM_ARCHIVE_PATH}"
export CC=clang-${major}.${minor}
export CXX=clang++-${major}.${minor}
fi
@ -101,6 +102,8 @@ else
export CXX=c++
fi
apt-get -y autoremove
# show the tool and compiler versions we're using
echo "=== Compiler and tool variables ==="
ninja --version

4
scripts/run.linux.sh
View File

@ -64,13 +64,13 @@ echo build_type_cxx: "${build_type_cxx}"
cd Debug
cmake ${SOL2_DIR} -G Ninja -DCMAKE_BUILD_TYPE=Debug ${build_type_cc} ${build_type_cxx} -DLUA_VERSION="${LUA_VERSION}" -DBUILD_LUA=ON -DBUILD_LUA_AS_DLL=OFF -DTESTS=ON -DEXAMPLES=ON -DSINGLE=ON -DTESTS_EXAMPLES=ON -DTESTS_SINGLE=ON -DCI=ON
cmake ${SOL2_DIR} -G Ninja -DCMAKE_BUILD_TYPE=Debug ${build_type_cc} ${build_type_cxx} -DLUA_VERSION="${LUA_VERSION}" -DBUILD_LUA=ON -DBUILD_LUA_AS_DLL=OFF -DTESTS=ON -DEXAMPLES=ON -DSINGLE=ON -DTESTS_EXAMPLES=ON -DEXAMPLES_SINGLE=ON -DTESTS_SINGLE=ON -DCI=ON
cmake --build . --config Debug
ctest --build-config Debug --output-on-failure
cd ..
cd Release
cmake ${SOL2_DIR} -G Ninja -DCMAKE_BUILD_TYPE=Release ${build_type_cc} ${build_type_cxx} -DLUA_VERSION="${LUA_VERSION}" -DBUILD_LUA=ON -DBUILD_LUA_AS_DLL=OFF -DTESTS=ON -DEXAMPLES=ON -DSINGLE=ON -DTESTS_EXAMPLES=ON -DTESTS_SINGLE=ON -DCI=ON
cmake ${SOL2_DIR} -G Ninja -DCMAKE_BUILD_TYPE=Release ${build_type_cc} ${build_type_cxx} -DLUA_VERSION="${LUA_VERSION}" -DBUILD_LUA=ON -DBUILD_LUA_AS_DLL=OFF -DTESTS=ON -DEXAMPLES=ON -DSINGLE=ON -DTESTS_EXAMPLES=ON -DEXAMPLES_SINGLE=ON -DTESTS_SINGLE=ON -DCI=ON
cmake --build . --config Release
ctest --build-config Release --output-on-failure
cd ..