From c52a4d04f7a600c978eae2c2fb0bd6bf6a38846c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 7 Apr 2024 11:49:15 -0500 Subject: [PATCH 01/14] Adjust CI to work with modular branches. --- .github/workflows/ci.yml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78bf31b..48da3cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,7 @@ on: - master - develop - feature/** + - modular env: UBSAN_OPTIONS: print_stacktrace=1 @@ -182,10 +183,12 @@ jobs: REF=${GITHUB_BASE_REF:-$GITHUB_REF} REF=${REF#refs/heads/} echo REF: $REF - BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true + BOOST_BRANCH=develop && ( test "${GITHUB_REF_NAME}" == "master" || test "${GITHUB_REF_NAME}" == "modular" ) && BOOST_BRANCH=${GITHUB_REF_NAME} || true + BOOST_GIT=https://github.com/${GITHUB_REPOSITORY/boostdep/boost}.git + echo BOOST_GIT: ${BOOST_GIT} echo BOOST_BRANCH: $BOOST_BRANCH cd .. - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root + git clone -b "${BOOST_BRANCH}" --depth 1 "${BOOST_GIT}" boost-root cd boost-root git submodule update --init libs/assert libs/bind cp -r $GITHUB_WORKSPACE/* tools/boostdep @@ -243,9 +246,12 @@ jobs: if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF% set BOOST_BRANCH=develop for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master + for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "modular" set BOOST_BRANCH=modular + set BOOST_GIT=https://github.com/%GITHUB_REPOSITORY:boostdep=boost%.git + echo BOOST_GIT: %BOOST_GIT% echo BOOST_BRANCH: %BOOST_BRANCH% cd .. - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root + git clone -b %BOOST_BRANCH% --depth 1 %BOOST_GIT% boost-root cd boost-root git submodule update --init libs/assert libs/bind xcopy /s /e /q %GITHUB_WORKSPACE% tools\boostdep\ @@ -274,10 +280,12 @@ jobs: REF=${GITHUB_BASE_REF:-$GITHUB_REF} REF=${REF#refs/heads/} echo REF: $REF - BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true + BOOST_BRANCH=develop && ( test "${GITHUB_REF_NAME}" == "master" || test "${GITHUB_REF_NAME}" == "modular" ) && BOOST_BRANCH=${GITHUB_REF_NAME} || true + BOOST_GIT=https://github.com/${GITHUB_REPOSITORY/boostdep/boost}.git + echo BOOST_GIT: ${BOOST_GIT} echo BOOST_BRANCH: $BOOST_BRANCH cd .. - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root + git clone -b "${BOOST_BRANCH}" --depth 1 "${BOOST_GIT}" boost-root cd boost-root git submodule update --init tools/build cp -r $GITHUB_WORKSPACE/* tools/boostdep @@ -320,10 +328,12 @@ jobs: REF=${GITHUB_BASE_REF:-$GITHUB_REF} REF=${REF#refs/heads/} echo REF: $REF - BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true + BOOST_BRANCH=develop && ( test "${GITHUB_REF_NAME}" == "master" || test "${GITHUB_REF_NAME}" == "modular" ) && BOOST_BRANCH=${GITHUB_REF_NAME} || true + BOOST_GIT=https://github.com/${GITHUB_REPOSITORY/boostdep/boost}.git + echo BOOST_GIT: ${BOOST_GIT} echo BOOST_BRANCH: $BOOST_BRANCH cd .. - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root + git clone -b "${BOOST_BRANCH}" --depth 1 "${BOOST_GIT}" boost-root cd boost-root git submodule update --init rm -rf tools/boostdep/* From 174e47848133fd07a6559184afd6298da6c88b67 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 7 Apr 2024 12:09:01 -0500 Subject: [PATCH 02/14] Add modular build setup. --- build/Jamfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Jamfile b/build/Jamfile index 2e0491b..9ad8f77 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -6,6 +6,6 @@ project : default-build release ; -exe boostdep : ../src/boostdep.cpp /boost//filesystem ; +exe boostdep : ../src/boostdep.cpp /boost/filesystem//boost_filesystem ; install dist-bin : boostdep : ../../../dist/bin ; From e5f45d889176633efb1bb015efd35aa3a5394078 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 7 Apr 2024 12:12:53 -0500 Subject: [PATCH 03/14] Add modular build setup. --- build.jam | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..e37ca67 --- /dev/null +++ b/build.jam @@ -0,0 +1,27 @@ +# Copyright René Ferdinand Rivera Morell 2024 +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import option ; +import path ; + +local DIST_DIR = [ option.get distdir ] ; +DIST_DIR ?= [ option.get build-dir ] ; +DIST_DIR ?= [ path.join $(BOOST_ROOT) dist ] ; +DIST_DIR ?= dist ; +DIST_DIR = [ path.root [ path.make $(DIST_DIR) ] [ path.pwd ] ] ; + +project /boost/boostdep + : common-requirements + ; + +explicit + [ install dist-bin + : build//boostdep/static + : EXE $(DIST_DIR)/bin + : release ] + [ alias dist : dist-bin ] + [ alias boostdep : build//boostdep ] + [ alias all : boostdep test dist ] + ; From 5b1054a469624099c33c6683e85f1c0a3782b403 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 7 Apr 2024 16:19:20 -0500 Subject: [PATCH 04/14] Avoid complexities of shared libs for CI. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48da3cb..5cab879 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -339,7 +339,7 @@ jobs: rm -rf tools/boostdep/* cp -r $GITHUB_WORKSPACE/* tools/boostdep ./bootstrap.sh - ./b2 tools/boostdep/build + ./b2 tools/boostdep/build link=static - name: Check exceptions run: | From 062a9d97aab2a27db6c8e3d8120beb418fa1a2bf Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 7 Apr 2024 23:54:27 -0500 Subject: [PATCH 05/14] Fix filsystem lib refs. --- test/Jamfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Jamfile b/test/Jamfile index 531262c..f886d6f 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -8,11 +8,11 @@ import testing ; path-constant ROOT : ../../.. ; path-constant HERE : . ; -run ../src/boostdep.cpp /boost//filesystem : --boost-root $(ROOT) --capture-output assert --compare-output $(HERE)/assert-primary.txt : : : assert-primary-txt ; -run ../src/boostdep.cpp /boost//filesystem : --boost-root $(ROOT) --capture-output --secondary bind --compare-output $(HERE)/bind-secondary.txt : : : bind-secondary-txt ; +run ../src/boostdep.cpp /boost/filesystem//boost_filesystem : --boost-root $(ROOT) --capture-output assert --compare-output $(HERE)/assert-primary.txt : : : assert-primary-txt ; +run ../src/boostdep.cpp /boost/filesystem//boost_filesystem : --boost-root $(ROOT) --capture-output --secondary bind --compare-output $(HERE)/bind-secondary.txt : : : bind-secondary-txt ; -run ../src/boostdep.cpp /boost//filesystem : --boost-root $(ROOT) --capture-output --html --primary assert --compare-output $(HERE)/assert-primary.html : : : assert-primary-html ; -run ../src/boostdep.cpp /boost//filesystem : --boost-root $(ROOT) --capture-output --html --secondary bind --compare-output $(HERE)/bind-secondary.html : : : bind-secondary-html ; +run ../src/boostdep.cpp /boost/filesystem//boost_filesystem : --boost-root $(ROOT) --capture-output --html --primary assert --compare-output $(HERE)/assert-primary.html : : : assert-primary-html ; +run ../src/boostdep.cpp /boost/filesystem//boost_filesystem : --boost-root $(ROOT) --capture-output --html --secondary bind --compare-output $(HERE)/bind-secondary.html : : : bind-secondary-html ; -run ../src/boostdep.cpp /boost//filesystem : --boost-root $(ROOT) --csv --capture-output --primary assert --compare-output $(HERE)/assert-primary.csv : : : assert-primary-csv ; -run ../src/boostdep.cpp /boost//filesystem : --boost-root $(ROOT) --csv --capture-output --secondary bind --compare-output $(HERE)/bind-secondary.csv : : : bind-secondary-csv ; +run ../src/boostdep.cpp /boost/filesystem//boost_filesystem : --boost-root $(ROOT) --csv --capture-output --primary assert --compare-output $(HERE)/assert-primary.csv : : : assert-primary-csv ; +run ../src/boostdep.cpp /boost/filesystem//boost_filesystem : --boost-root $(ROOT) --csv --capture-output --secondary bind --compare-output $(HERE)/bind-secondary.csv : : : bind-secondary-csv ; From 2dd8967e6c56a151ae8bbb9e6e614b4e3622fe63 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 12 Apr 2024 23:14:16 -0500 Subject: [PATCH 06/14] Remove redundant build//install target. --- build/Jamfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/Jamfile b/build/Jamfile index 9ad8f77..3b6421c 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -7,5 +7,3 @@ project : default-build release ; exe boostdep : ../src/boostdep.cpp /boost/filesystem//boost_filesystem ; - -install dist-bin : boostdep : ../../../dist/bin ; From a5b66cc248bbd94e6d26d186b5b1b21c9046c569 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 12 Apr 2024 23:57:30 -0500 Subject: [PATCH 07/14] Fix reference to build in CI as a way to dist install. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5cab879..61483c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -295,7 +295,7 @@ jobs: run: | cd ../boost-root python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" ../tools/boostdep - ./b2 -j3 tools/boostdep/build + ./b2 -j3 tools/boostdep//dist posix-cmake: @@ -339,7 +339,7 @@ jobs: rm -rf tools/boostdep/* cp -r $GITHUB_WORKSPACE/* tools/boostdep ./bootstrap.sh - ./b2 tools/boostdep/build link=static + ./b2 tools/boostdep//dist link=static - name: Check exceptions run: | From b69e0bc36363d017d9b0ffd6d16b9e1cfdbe5bcc Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Apr 2024 22:51:55 -0500 Subject: [PATCH 08/14] Build the dist target for tools by default. --- build.jam | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.jam b/build.jam index e37ca67..c5a216c 100644 --- a/build.jam +++ b/build.jam @@ -12,16 +12,16 @@ DIST_DIR ?= [ path.join $(BOOST_ROOT) dist ] ; DIST_DIR ?= dist ; DIST_DIR = [ path.root [ path.make $(DIST_DIR) ] [ path.pwd ] ] ; -project /boost/boostdep - : common-requirements - ; +project /boost/boostdep ; explicit [ install dist-bin : build//boostdep/static : EXE $(DIST_DIR)/bin : release ] - [ alias dist : dist-bin ] [ alias boostdep : build//boostdep ] - [ alias all : boostdep test dist ] + [ alias all : boostdep test dist-bin ] ; + +# Install distribution files/execs by default. +alias dist : dist-bin ; From fbf4ed6478cc8f1f9f3b806d508c015e3f83cb5c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 2 May 2024 08:53:02 -0500 Subject: [PATCH 09/14] Rework BOOST_BRANCH value to avoid modular branch name in the logic. --- .github/workflows/ci.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61483c9..a5b90b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -179,11 +179,11 @@ jobs: run: | echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY echo GITHUB_BASE_REF: $GITHUB_BASE_REF - echo GITHUB_REF: $GITHUB_REF - REF=${GITHUB_BASE_REF:-$GITHUB_REF} - REF=${REF#refs/heads/} - echo REF: $REF - BOOST_BRANCH=develop && ( test "${GITHUB_REF_NAME}" == "master" || test "${GITHUB_REF_NAME}" == "modular" ) && BOOST_BRANCH=${GITHUB_REF_NAME} || true + echo GITHUB_REF_NAME: $GITHUB_REF_NAME + BOOST_BRANCH=develop + [[ -n "${GITHUB_REF_NAME}" ]] && BOOST_BRANCH=${GITHUB_REF_NAME} + [[ "${GITHUB_REF_NAME}" =~ ^"feature/" ]] && BOOST_BRANCH=develop + [[ -n "${GITHUB_BASE_REF}" ]] && BOOST_BRANCH=${GITHUB_BASE_REF} BOOST_GIT=https://github.com/${GITHUB_REPOSITORY/boostdep/boost}.git echo BOOST_GIT: ${BOOST_GIT} echo BOOST_BRANCH: $BOOST_BRANCH @@ -241,12 +241,12 @@ jobs: shell: cmd run: | echo GITHUB_REPOSITORY: %GITHUB_REPOSITORY% + echo GITHUB_REF_NAME: %GITHUB_REF_NAME% echo GITHUB_BASE_REF: %GITHUB_BASE_REF% - echo GITHUB_REF: %GITHUB_REF% - if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF% set BOOST_BRANCH=develop - for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master - for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "modular" set BOOST_BRANCH=modular + if [%GITHUB_REF_NAME%] NEQ [] set BOOST_BRANCH=%GITHUB_REF_NAME% + if [%GITHUB_REF_NAME:~0,8%] EQU [feature/] set BOOST_BRANCH=develop + if [%GITHUB_BASE_REF%] NEQ [] set BOOST_BRANCH=%GITHUB_BASE_REF% set BOOST_GIT=https://github.com/%GITHUB_REPOSITORY:boostdep=boost%.git echo BOOST_GIT: %BOOST_GIT% echo BOOST_BRANCH: %BOOST_BRANCH% @@ -276,11 +276,11 @@ jobs: run: | echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY echo GITHUB_BASE_REF: $GITHUB_BASE_REF - echo GITHUB_REF: $GITHUB_REF - REF=${GITHUB_BASE_REF:-$GITHUB_REF} - REF=${REF#refs/heads/} - echo REF: $REF - BOOST_BRANCH=develop && ( test "${GITHUB_REF_NAME}" == "master" || test "${GITHUB_REF_NAME}" == "modular" ) && BOOST_BRANCH=${GITHUB_REF_NAME} || true + echo GITHUB_REF_NAME: $GITHUB_REF_NAME + BOOST_BRANCH=develop + [[ -n "${GITHUB_REF_NAME}" ]] && BOOST_BRANCH=${GITHUB_REF_NAME} + [[ "${GITHUB_REF_NAME}" =~ ^"feature/" ]] && BOOST_BRANCH=develop + [[ -n "${GITHUB_BASE_REF}" ]] && BOOST_BRANCH=${GITHUB_BASE_REF} BOOST_GIT=https://github.com/${GITHUB_REPOSITORY/boostdep/boost}.git echo BOOST_GIT: ${BOOST_GIT} echo BOOST_BRANCH: $BOOST_BRANCH @@ -324,11 +324,11 @@ jobs: run: | echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY echo GITHUB_BASE_REF: $GITHUB_BASE_REF - echo GITHUB_REF: $GITHUB_REF - REF=${GITHUB_BASE_REF:-$GITHUB_REF} - REF=${REF#refs/heads/} - echo REF: $REF - BOOST_BRANCH=develop && ( test "${GITHUB_REF_NAME}" == "master" || test "${GITHUB_REF_NAME}" == "modular" ) && BOOST_BRANCH=${GITHUB_REF_NAME} || true + echo GITHUB_REF_NAME: $GITHUB_REF_NAME + BOOST_BRANCH=develop + [[ -n "${GITHUB_REF_NAME}" ]] && BOOST_BRANCH=${GITHUB_REF_NAME} + [[ "${GITHUB_REF_NAME}" =~ ^"feature/" ]] && BOOST_BRANCH=develop + [[ -n "${GITHUB_BASE_REF}" ]] && BOOST_BRANCH=${GITHUB_BASE_REF} BOOST_GIT=https://github.com/${GITHUB_REPOSITORY/boostdep/boost}.git echo BOOST_GIT: ${BOOST_GIT} echo BOOST_BRANCH: $BOOST_BRANCH From b7985aca56ba72d2d66444682d1e44b2b01b9344 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 2 May 2024 08:55:40 -0500 Subject: [PATCH 10/14] Use imperative declarations of explicit targets per @pdimov's preference. --- build.jam | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/build.jam b/build.jam index c5a216c..e072652 100644 --- a/build.jam +++ b/build.jam @@ -14,14 +14,15 @@ DIST_DIR = [ path.root [ path.make $(DIST_DIR) ] [ path.pwd ] ] ; project /boost/boostdep ; -explicit - [ install dist-bin - : build//boostdep/static - : EXE $(DIST_DIR)/bin - : release ] - [ alias boostdep : build//boostdep ] - [ alias all : boostdep test dist-bin ] - ; +install dist-bin + : build//boostdep/static + : EXE $(DIST_DIR)/bin + : release ; +explicit install ; +alias boostdep : build//boostdep ; +explicit boostdep ; +alias all : boostdep test dist-bin ; +explicit all ; # Install distribution files/execs by default. alias dist : dist-bin ; From 88c9347e61dc8d08f4205bd99af3fcf5eec59ae2 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 2 May 2024 18:18:05 -0500 Subject: [PATCH 11/14] Remove temp link=static that crept in for CI build. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5b90b0..7288f84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -339,7 +339,7 @@ jobs: rm -rf tools/boostdep/* cp -r $GITHUB_WORKSPACE/* tools/boostdep ./bootstrap.sh - ./b2 tools/boostdep//dist link=static + ./b2 tools/boostdep//dist - name: Check exceptions run: | From 09440fff6003a6fe79fb1a08a689dc5bfeab49d6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:01:26 -0500 Subject: [PATCH 12/14] Add requires-b2 check to top-level build file. --- build.jam | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.jam b/build.jam index e072652..4fa786f 100644 --- a/build.jam +++ b/build.jam @@ -3,6 +3,8 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +require-b2 5.1 ; + import option ; import path ; From d96b2b5d2cce098b27717efe682081d98ad36162 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:52:21 -0500 Subject: [PATCH 13/14] Bump B2 require to 5.2 --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 4fa786f..33d70ec 100644 --- a/build.jam +++ b/build.jam @@ -3,7 +3,7 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -require-b2 5.1 ; +require-b2 5.2 ; import option ; import path ; From 6fdaf8dddb4c88ab0179ec6d0c548498f08d3e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Ferdinand=20Rivera=20Morell?= Date: Thu, 10 Oct 2024 13:20:10 -0500 Subject: [PATCH 14/14] Undo modular CI testing fork changes. --- .github/workflows/ci.yml | 58 +++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a2673b..f283ca0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,6 @@ on: - master - develop - feature/** - - modular env: UBSAN_OPTIONS: print_stacktrace=1 @@ -194,16 +193,14 @@ jobs: run: | echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY echo GITHUB_BASE_REF: $GITHUB_BASE_REF - echo GITHUB_REF_NAME: $GITHUB_REF_NAME - BOOST_BRANCH=develop - [[ -n "${GITHUB_REF_NAME}" ]] && BOOST_BRANCH=${GITHUB_REF_NAME} - [[ "${GITHUB_REF_NAME}" =~ ^"feature/" ]] && BOOST_BRANCH=develop - [[ -n "${GITHUB_BASE_REF}" ]] && BOOST_BRANCH=${GITHUB_BASE_REF} - BOOST_GIT=https://github.com/${GITHUB_REPOSITORY/boostdep/boost}.git - echo BOOST_GIT: ${BOOST_GIT} + echo GITHUB_REF: $GITHUB_REF + REF=${GITHUB_BASE_REF:-$GITHUB_REF} + REF=${REF#refs/heads/} + echo REF: $REF + BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true echo BOOST_BRANCH: $BOOST_BRANCH cd .. - git clone -b "${BOOST_BRANCH}" --depth 1 "${BOOST_GIT}" boost-root + git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root git submodule update --init libs/assert libs/bind cp -r $GITHUB_WORKSPACE/* tools/boostdep @@ -256,17 +253,14 @@ jobs: shell: cmd run: | echo GITHUB_REPOSITORY: %GITHUB_REPOSITORY% - echo GITHUB_REF_NAME: %GITHUB_REF_NAME% echo GITHUB_BASE_REF: %GITHUB_BASE_REF% + echo GITHUB_REF: %GITHUB_REF% + if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF% set BOOST_BRANCH=develop - if [%GITHUB_REF_NAME%] NEQ [] set BOOST_BRANCH=%GITHUB_REF_NAME% - if [%GITHUB_REF_NAME:~0,8%] EQU [feature/] set BOOST_BRANCH=develop - if [%GITHUB_BASE_REF%] NEQ [] set BOOST_BRANCH=%GITHUB_BASE_REF% - set BOOST_GIT=https://github.com/%GITHUB_REPOSITORY:boostdep=boost%.git - echo BOOST_GIT: %BOOST_GIT% + for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master echo BOOST_BRANCH: %BOOST_BRANCH% cd .. - git clone -b %BOOST_BRANCH% --depth 1 %BOOST_GIT% boost-root + git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root git submodule update --init libs/assert libs/bind xcopy /s /e /q %GITHUB_WORKSPACE% tools\boostdep\ @@ -291,16 +285,14 @@ jobs: run: | echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY echo GITHUB_BASE_REF: $GITHUB_BASE_REF - echo GITHUB_REF_NAME: $GITHUB_REF_NAME - BOOST_BRANCH=develop - [[ -n "${GITHUB_REF_NAME}" ]] && BOOST_BRANCH=${GITHUB_REF_NAME} - [[ "${GITHUB_REF_NAME}" =~ ^"feature/" ]] && BOOST_BRANCH=develop - [[ -n "${GITHUB_BASE_REF}" ]] && BOOST_BRANCH=${GITHUB_BASE_REF} - BOOST_GIT=https://github.com/${GITHUB_REPOSITORY/boostdep/boost}.git - echo BOOST_GIT: ${BOOST_GIT} + echo GITHUB_REF: $GITHUB_REF + REF=${GITHUB_BASE_REF:-$GITHUB_REF} + REF=${REF#refs/heads/} + echo REF: $REF + BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true echo BOOST_BRANCH: $BOOST_BRANCH cd .. - git clone -b "${BOOST_BRANCH}" --depth 1 "${BOOST_GIT}" boost-root + git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root git submodule update --init tools/build cp -r $GITHUB_WORKSPACE/* tools/boostdep @@ -310,7 +302,7 @@ jobs: run: | cd ../boost-root python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" ../tools/boostdep - ./b2 -j3 tools/boostdep//dist + ./b2 -j3 tools/boostdep/build posix-cmake: @@ -339,22 +331,20 @@ jobs: run: | echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY echo GITHUB_BASE_REF: $GITHUB_BASE_REF - echo GITHUB_REF_NAME: $GITHUB_REF_NAME - BOOST_BRANCH=develop - [[ -n "${GITHUB_REF_NAME}" ]] && BOOST_BRANCH=${GITHUB_REF_NAME} - [[ "${GITHUB_REF_NAME}" =~ ^"feature/" ]] && BOOST_BRANCH=develop - [[ -n "${GITHUB_BASE_REF}" ]] && BOOST_BRANCH=${GITHUB_BASE_REF} - BOOST_GIT=https://github.com/${GITHUB_REPOSITORY/boostdep/boost}.git - echo BOOST_GIT: ${BOOST_GIT} + echo GITHUB_REF: $GITHUB_REF + REF=${GITHUB_BASE_REF:-$GITHUB_REF} + REF=${REF#refs/heads/} + echo REF: $REF + BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true echo BOOST_BRANCH: $BOOST_BRANCH cd .. - git clone -b "${BOOST_BRANCH}" --depth 1 "${BOOST_GIT}" boost-root + git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root git submodule update --init rm -rf tools/boostdep/* cp -r $GITHUB_WORKSPACE/* tools/boostdep ./bootstrap.sh - ./b2 tools/boostdep//dist + ./b2 tools/boostdep/build - name: Check exceptions run: |