From 686a5820a02fe1c92de8c664ecedab9f27151534 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Wed, 21 Aug 2019 09:44:53 +0100 Subject: [PATCH 1/8] Add circle-ci inspection run. --- .circleci/config.yml | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000..3706a983 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,61 @@ +version: 2 + +jobs: + build: + environment: + - BOOST_LIBRARY=process + - CXX_STANDARD=gnu++11 + docker: + - image: gcc:7 + steps: + - checkout + - run: + name: Setting up Environment + command: | + echo 'export BOOST="$HOME/boost-local"' >> $BASH_ENV + if [ $CIRCLE_BRANCH = "master" ]; then + echo 'export BOOST_BRANCH="master"' >> $BASH_ENV; + else + echo 'export BOOST_BRANCH="develop"' >> $BASH_ENV; + fi + echo 'export BOOST_REMOVE="$BOOST/libs/$BOOST_LIBRARY"' >> $BASH_ENV + HOME_SED_=$(echo $HOME | sed -e 's/\//\\\//g') + echo 'export HOME_SED=$HOME_SED_' >> $BASH_ENV + - run: + name: install pre dependencies + command: | + apt-get update -yqq + apt-get install git -y + - run: + name: Initializing git repo for boost + command: | + mkdir boost-config + cd boost-config + echo Testing $CIRCLE_BRANCH + git remote add --no-tags -t $BOOST_BRANCH origin https://github.com/boostorg/boost.git + git fetch --depth=1 + git checkout $BOOST_BRANCH + git submodule update --init --merge + git remote set-branches --add origin $BOOST_BRANCH + git pull --recurse-submodules + git submodule update --init + git checkout $BOOST_BRANCH + git submodule foreach "git reset --quiet --hard; git clean -fxd" + git reset --hard; git clean -fxd + git status + rm -rf $BOOST_REMOVE + mv $HOME/project $BOOST_REMOVE + - run: + name: Bootstrapping boost-build + command: | + cd $BOOST + ./bootstrap.sh + ./b2 headers + - run: + name: Building inspect + command: | + cd tools/inspect/build && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxflags="-std=gnu++14" release dist-bin + - run: + name: Running Inspect + command: | + cd $BOOST_REMOVE && ../../dist/bin/inspect -text -license -copyright -crlf -end -link -path_name -tab -ascii -apple_macro -assert_macro -minmax -unnamed -version-string From ead17bf12ab7c8ff8568dae7cd5d247965dbb32b Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Wed, 21 Aug 2019 09:46:46 +0100 Subject: [PATCH 2/8] correct circle-ci config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3706a983..4bd103d6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: build: environment: - - BOOST_LIBRARY=process + - BOOST_LIBRARY=config - CXX_STANDARD=gnu++11 docker: - image: gcc:7 @@ -29,8 +29,8 @@ jobs: - run: name: Initializing git repo for boost command: | - mkdir boost-config - cd boost-config + mkdir $BOOST + cd $BOOST echo Testing $CIRCLE_BRANCH git remote add --no-tags -t $BOOST_BRANCH origin https://github.com/boostorg/boost.git git fetch --depth=1 From 09863d3dfde858c95c6fd816830f23b21043ffe5 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Wed, 21 Aug 2019 10:52:52 +0100 Subject: [PATCH 3/8] Change boost init for circle-ci --- .circleci/config.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4bd103d6..ffff27e3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ jobs: else echo 'export BOOST_BRANCH="develop"' >> $BASH_ENV; fi - echo 'export BOOST_REMOVE="$BOOST/libs/$BOOST_LIBRARY"' >> $BASH_ENV + echo 'export BOOST_REMOVE="$BOOST/boost/libs/$BOOST_LIBRARY"' >> $BASH_ENV HOME_SED_=$(echo $HOME | sed -e 's/\//\\\//g') echo 'export HOME_SED=$HOME_SED_' >> $BASH_ENV - run: @@ -29,33 +29,28 @@ jobs: - run: name: Initializing git repo for boost command: | + echo BOOST=$BOOST BOOST_REMOVE=$BOOST_REMOVE BOOST_LIBRARY=$BOOST_LIBRARY BOOST_BRANCH=$BOOST_BRANCH PWD=$PWD mkdir $BOOST cd $BOOST - echo Testing $CIRCLE_BRANCH - git remote add --no-tags -t $BOOST_BRANCH origin https://github.com/boostorg/boost.git - git fetch --depth=1 - git checkout $BOOST_BRANCH + git clone --single-branch --branch $BOOST_BRANCH https://github.com/boostorg/boost.git + cd boost git submodule update --init --merge - git remote set-branches --add origin $BOOST_BRANCH - git pull --recurse-submodules - git submodule update --init - git checkout $BOOST_BRANCH - git submodule foreach "git reset --quiet --hard; git clean -fxd" - git reset --hard; git clean -fxd - git status rm -rf $BOOST_REMOVE mv $HOME/project $BOOST_REMOVE - run: name: Bootstrapping boost-build command: | + echo $PWD cd $BOOST ./bootstrap.sh ./b2 headers - run: name: Building inspect command: | + echo $PWD cd tools/inspect/build && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxflags="-std=gnu++14" release dist-bin - run: name: Running Inspect command: | + echo $PWD cd $BOOST_REMOVE && ../../dist/bin/inspect -text -license -copyright -crlf -end -link -path_name -tab -ascii -apple_macro -assert_macro -minmax -unnamed -version-string From 36561293dd421dadd05854a2f328609873ad5164 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Wed, 21 Aug 2019 10:57:07 +0100 Subject: [PATCH 4/8] circle-ci: fix paths. --- .circleci/config.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ffff27e3..245cc1a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,17 +40,12 @@ jobs: - run: name: Bootstrapping boost-build command: | - echo $PWD - cd $BOOST - ./bootstrap.sh - ./b2 headers + cd $BOOST/boost && ./bootstrap.sh && ./b2 headers - run: name: Building inspect command: | - echo $PWD - cd tools/inspect/build && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxflags="-std=gnu++14" release dist-bin + cd $BOOST/boost/tools/inspect/build && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxflags="-std=gnu++14" release dist-bin - run: name: Running Inspect command: | - echo $PWD cd $BOOST_REMOVE && ../../dist/bin/inspect -text -license -copyright -crlf -end -link -path_name -tab -ascii -apple_macro -assert_macro -minmax -unnamed -version-string From 61e771dcae89d830b45bb074bd2aabdc2e0edb90 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Wed, 21 Aug 2019 11:02:53 +0100 Subject: [PATCH 5/8] circle-ci: Fix inspect command line. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 245cc1a8..945edd69 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,4 +48,4 @@ jobs: - run: name: Running Inspect command: | - cd $BOOST_REMOVE && ../../dist/bin/inspect -text -license -copyright -crlf -end -link -path_name -tab -ascii -apple_macro -assert_macro -minmax -unnamed -version-string + cd $BOOST_REMOVE && ../../dist/bin/inspect -text -license -copyright -crlf -end -link -path_name -tab -ascii -apple_macro -assert_macro -minmax -unnamed From 83b94636437e408c06e185558a32a01bb5b007ba Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Wed, 21 Aug 2019 11:08:06 +0100 Subject: [PATCH 6/8] Fix inspection report issues. --- test/cmd_line_check.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cmd_line_check.cpp b/test/cmd_line_check.cpp index 36b3212e..eb802998 100644 --- a/test/cmd_line_check.cpp +++ b/test/cmd_line_check.cpp @@ -11,5 +11,5 @@ int main() { - return 0; -} \ No newline at end of file + return 0; +} From 270758d5b0f974a1c3740e89ce110708d135f772 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Wed, 21 Aug 2019 13:34:40 +0100 Subject: [PATCH 7/8] Add doc build to circle-ci. --- .circleci/config.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 945edd69..114dd30f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ jobs: name: install pre dependencies command: | apt-get update -yqq - apt-get install git -y + apt-get install git xsltproc docbook-xsl docbook-xml -y - run: name: Initializing git repo for boost command: | @@ -41,10 +41,16 @@ jobs: name: Bootstrapping boost-build command: | cd $BOOST/boost && ./bootstrap.sh && ./b2 headers + echo "using xsltproc ;" | tee $HOME/user-config.jam + echo "using boostbook : /usr/share/sgml/docbook/stylesheet/docbook-xsl : /usr/share/sgml/docbook/dtd/xml/4.2 ;" | tee -a $HOME/user-config.jam - run: name: Building inspect command: | cd $BOOST/boost/tools/inspect/build && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxflags="-std=gnu++14" release dist-bin + - run: + name: Building docs + command: | + cd $BOOST_REMOVE/doc && rm -rf html && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxflags="-std=gnu++14" release - run: name: Running Inspect command: | From 490e9106f9ce49dd2bcae29466bb33cd1cfb3be8 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Wed, 21 Aug 2019 13:38:48 +0100 Subject: [PATCH 8/8] circle-ci: fix docbook path --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 114dd30f..600502fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,7 +42,7 @@ jobs: command: | cd $BOOST/boost && ./bootstrap.sh && ./b2 headers echo "using xsltproc ;" | tee $HOME/user-config.jam - echo "using boostbook : /usr/share/sgml/docbook/stylesheet/docbook-xsl : /usr/share/sgml/docbook/dtd/xml/4.2 ;" | tee -a $HOME/user-config.jam + echo "using boostbook : /usr/share/xml/docbook/stylesheet/docbook-xsl : /usr/share/sgml/docbook/dtd/xml/4.2 ;" | tee -a $HOME/user-config.jam - run: name: Building inspect command: |