boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-31 20:04:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Daniel James
2018-04-16 07:05:46 +01:00
parent 741a10f5a8 f3649e4ae0
commit 9abce00f24
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@@ -18,7 +18,7 @@ environment:
install: install:
- set BOOST_ROOT=c:\projects\boost - set BOOST_ROOT=c:\projects\boost
- cd c:\projects\ - cd c:\projects\
- python %APPVEYOR_BUILD_FOLDER%\build\download-boost-snapshot.py master - python %APPVEYOR_BUILD_FOLDER%\ci\download-boost-snapshot.py master
- rd /s /q %BOOST_ROOT%\boost\unordered - rd /s /q %BOOST_ROOT%\boost\unordered
- cd %BOOST_ROOT%\tools\build - cd %BOOST_ROOT%\tools\build
- cmd /c bootstrap - cmd /c bootstrap

14
.travis.yml
View File

@@ -19,32 +19,32 @@ matrix:
- compiler: gcc - compiler: gcc
env: | env: |
label="gcc C++03/11"; label="gcc C++03/11";
user_config="using gcc : : g++-4.8 --coverage -fsanitize=address -Werror ;" user_config="using gcc : : g++-4.8 --coverage -fsanitize=address ;"
enable_coverage=1 enable_coverage=1
CXXSTD=03,11 CXXSTD=03,11
- compiler: gcc - compiler: gcc
env: | env: |
label="gcc 32 bit C++11"; label="gcc 32 bit C++11";
user_config="using gcc : : g++-4.8 -m32 -fsanitize=address -Werror ;" user_config="using gcc : : g++-4.8 -m32 -fsanitize=address ;"
CXXSTD=11 CXXSTD=11
- compiler: clang - compiler: clang
env: | env: |
label="clang C++11/17"; label="clang C++11/17";
user_config="using clang : : clang++ -fsanitize=address -Werror ;" user_config="using clang : : clang++ -fsanitize=address ;"
CXXSTD=11,17 CXXSTD=11,17
# sanitized=address not available for 32-bit clang on travis. # sanitized=address not available for 32-bit clang on travis.
- compiler: clang - compiler: clang
env: | env: |
label="clang 32 bit"; label="clang 32 bit";
user_config="using clang : : clang++ -m32 -Werror ;" user_config="using clang : : clang++ -m32 ;"
CXXSTD=03 CXXSTD=03
before_install: before_install:
- if [ -n $enable_coverage ]; then pip install --user cpp-coveralls; fi - if [ -n $enable_coverage ]; then pip install --user cpp-coveralls; fi
before_script: before_script:
- export BOOST_VERSION=1.66.0 - export BOOST_VERSION=1.67.0
- export BOOST_FILENAME=boost_1_66_0 - export BOOST_FILENAME=boost_1_67_0
- export BOOST_ROOT=${HOME}/boost - export BOOST_ROOT=${HOME}/boost
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}
- touch Jamroot.jam - touch Jamroot.jam
@@ -70,7 +70,7 @@ before_script:
echo "Downloading ${download_url}" echo "Downloading ${download_url}"
mkdir $HOME/download mkdir $HOME/download
cd $HOME/download cd $HOME/download
python ${TRAVIS_BUILD_DIR}/build/download-boost-snapshot.py $snapshot python ${TRAVIS_BUILD_DIR}/ci/download-boost-snapshot.py $snapshot
mv * ${BOOST_ROOT} mv * ${BOOST_ROOT}
- rm -r ${BOOST_ROOT}/boost/unordered - rm -r ${BOOST_ROOT}/boost/unordered
- cd ${BOOST_ROOT}/tools/build - cd ${BOOST_ROOT}/tools/build

0
build/download-boost-snapshot.py → ci/download-boost-snapshot.py
View File