From f3a0380caf5963fd014a9d3b64c795a95cb1291c Mon Sep 17 00:00:00 2001 From: Hans Dembinski Date: Thu, 12 Jun 2025 18:08:43 +0200 Subject: [PATCH 01/10] fix doc build --- .github/workflows/doc.yml | 62 ++++++++++++++++++++++++++++++++++++++ .github/workflows/slow.yml | 1 - doc/Jamfile | 9 +----- 3 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/doc.yml diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml new file mode 100644 index 00000000..24a56f76 --- /dev/null +++ b/.github/workflows/doc.yml @@ -0,0 +1,62 @@ +name: Slow + +on: + pull_request: + branches: + - master + - develop + paths-ignore: + - 'tools/**' + - '*.md' + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref }} + cancel-in-progress: true + +jobs: + gcc: + runs-on: ubuntu-latest + steps: + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + + - name: Install docbook dependencies + run: | + sudo apt-get update + sudo apt-get install -y docbook-xsl docbook-xml xsltproc + + - name: Create user-config.jam + run: | + echo "using xsltproc ;" > user-config.jam + echo "using boostbook : /usr/share/xml/docbook/stylesheet/nwalsh : /usr/share/xml/docbook/schema/dtd/4.2 ;" >> user-config.jam + echo "using doxygen : /usr/bin/doxygen ;" >> user-config.jam + echo "using python : 3.12 : /usr/bin/python3 ; " >> user-config.jam + + - uses: actions/checkout@v4 + + - name: Fetch Boost superproject + run: | + cd .. + git clone -b $GITHUB_BASE_REF --depth 5 https://github.com/boostorg/boost.git + cd boost + mv -f $GITHUB_WORKSPACE/* libs/histogram + git submodule update --init --depth 5 tools/build tools/boostdep + git submodule update --init --depth 5 libs/format + python tools/boostdep/depinst/depinst.py --git_args "--depth 5 --jobs 3" histogram + mv -f * $GITHUB_WORKSPACE + + - name: Prepare b2 + run: ./bootstrap.sh + + - name: Build documentation + run: | + cd libs/histogram + ../../b2 docs + + - name: Upload documentation + uses: actions/upload-artifact@v4 + with: + name: histogram-docs + path: libs/histogram/doc/html + if-no-files-found: error diff --git a/.github/workflows/slow.yml b/.github/workflows/slow.yml index b1f5a0b5..fe45e28b 100644 --- a/.github/workflows/slow.yml +++ b/.github/workflows/slow.yml @@ -19,7 +19,6 @@ env: UBSAN_OPTIONS: print_stacktrace=1 LSAN_OPTIONS: verbosity=1:log_threads=1 ASAN_OPTIONS: detect_leaks=1:detect_stack_use_after_return=1 - COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }} jobs: appleclang: diff --git a/doc/Jamfile b/doc/Jamfile index 3c836543..9e3af71c 100644 --- a/doc/Jamfile +++ b/doc/Jamfile @@ -41,14 +41,7 @@ doxygen reference actions doxygen-postprocessing { - if [ os.name ] = NT - { - python $(THIS_PATH)/doxygen_postprocessing.py "$(>)" - } - else - { - python3 $(THIS_PATH)/doxygen_postprocessing.py "$(>)" - } + python3 $(THIS_PATH)/doxygen_postprocessing.py "$(>)" } notfile reference-pp : @doxygen-postprocessing : reference.xml ; From 4d77fba06d9aea074454844ec442aa1809a4130c Mon Sep 17 00:00:00 2001 From: Hans Dembinski Date: Thu, 12 Jun 2025 18:15:38 +0200 Subject: [PATCH 02/10] don't build stuff that didn't change --- .github/workflows/cov.yml | 1 + .github/workflows/fast.yml | 1 + .github/workflows/slow.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/cov.yml b/.github/workflows/cov.yml index 2c050efd..2cbab74d 100644 --- a/.github/workflows/cov.yml +++ b/.github/workflows/cov.yml @@ -7,6 +7,7 @@ on: - develop paths-ignore: - 'doc/**' + - '.github/workflows/doc.yml' - 'examples/**' - '*.md' diff --git a/.github/workflows/fast.yml b/.github/workflows/fast.yml index 61841587..31d39398 100644 --- a/.github/workflows/fast.yml +++ b/.github/workflows/fast.yml @@ -7,6 +7,7 @@ on: - develop paths-ignore: - 'doc/**' + - '.github/workflows/doc.yml' - 'examples/**' - 'tools/**' - '*.md' diff --git a/.github/workflows/slow.yml b/.github/workflows/slow.yml index fe45e28b..2ffa71b8 100644 --- a/.github/workflows/slow.yml +++ b/.github/workflows/slow.yml @@ -7,6 +7,7 @@ on: - develop paths-ignore: - 'doc/**' + - '.github/workflows/doc.yml' - 'tools/**' - '*.md' From 7e194d8547b4f173c42667fc96ef9a815962e935 Mon Sep 17 00:00:00 2001 From: Hans Dembinski Date: Thu, 12 Jun 2025 18:19:14 +0200 Subject: [PATCH 03/10] ignore other yml --- .github/workflows/cov.yml | 4 +++- .github/workflows/doc.yml | 3 +++ .github/workflows/fast.yml | 4 +++- .github/workflows/slow.yml | 4 +++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cov.yml b/.github/workflows/cov.yml index 2cbab74d..4eee0536 100644 --- a/.github/workflows/cov.yml +++ b/.github/workflows/cov.yml @@ -6,8 +6,10 @@ on: - master - develop paths-ignore: - - 'doc/**' - '.github/workflows/doc.yml' + - '.github/workflows/fast.yml' + - '.github/workflows/slow.yml' + - 'doc/**' - 'examples/**' - '*.md' diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 24a56f76..6a705c41 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -6,6 +6,9 @@ on: - master - develop paths-ignore: + - '.github/workflows/cov.yml' + - '.github/workflows/fast.yml' + - '.github/workflows/slow.yml' - 'tools/**' - '*.md' diff --git a/.github/workflows/fast.yml b/.github/workflows/fast.yml index 31d39398..c0a2fa91 100644 --- a/.github/workflows/fast.yml +++ b/.github/workflows/fast.yml @@ -6,8 +6,10 @@ on: - master - develop paths-ignore: - - 'doc/**' + - '.github/workflows/cov.yml' - '.github/workflows/doc.yml' + - '.github/workflows/slow.yml' + - 'doc/**' - 'examples/**' - 'tools/**' - '*.md' diff --git a/.github/workflows/slow.yml b/.github/workflows/slow.yml index 2ffa71b8..d2dc3275 100644 --- a/.github/workflows/slow.yml +++ b/.github/workflows/slow.yml @@ -6,8 +6,10 @@ on: - master - develop paths-ignore: - - 'doc/**' + - '.github/workflows/cov.yml' - '.github/workflows/doc.yml' + - '.github/workflows/fast.yml' + - 'doc/**' - 'tools/**' - '*.md' From 9928a242fbb4e666c3fc50a8c567cf9c216bb3e8 Mon Sep 17 00:00:00 2001 From: Hans Dembinski Date: Thu, 12 Jun 2025 18:21:15 +0200 Subject: [PATCH 04/10] fix naming --- .github/workflows/doc.yml | 2 +- .github/workflows/fast.yml | 2 +- .github/workflows/slow.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 6a705c41..661ac6b0 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -1,4 +1,4 @@ -name: Slow +name: Documentation on: pull_request: diff --git a/.github/workflows/fast.yml b/.github/workflows/fast.yml index c0a2fa91..25831870 100644 --- a/.github/workflows/fast.yml +++ b/.github/workflows/fast.yml @@ -1,4 +1,4 @@ -name: Fast +name: Fast tests (cmake) on: pull_request: diff --git a/.github/workflows/slow.yml b/.github/workflows/slow.yml index d2dc3275..93f9cdfa 100644 --- a/.github/workflows/slow.yml +++ b/.github/workflows/slow.yml @@ -1,4 +1,4 @@ -name: Slow +name: Slow tests (b2) on: pull_request: From d43e7fbffd101b69fea4f9bd85335fc37cc58073 Mon Sep 17 00:00:00 2001 From: Hans Dembinski Date: Thu, 12 Jun 2025 18:24:33 +0200 Subject: [PATCH 05/10] fix --- .github/workflows/doc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 661ac6b0..45e3c31f 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -55,7 +55,7 @@ jobs: - name: Build documentation run: | cd libs/histogram - ../../b2 docs + ../../b2 doc - name: Upload documentation uses: actions/upload-artifact@v4 From b54dda7d1a5918ac909baf3298b49e0b0e245979 Mon Sep 17 00:00:00 2001 From: Hans Dembinski Date: Thu, 12 Jun 2025 18:28:42 +0200 Subject: [PATCH 06/10] fix --- .github/workflows/doc.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 45e3c31f..cfaee0d9 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -27,14 +27,14 @@ jobs: - name: Install docbook dependencies run: | sudo apt-get update - sudo apt-get install -y docbook-xsl docbook-xml xsltproc + sudo apt-get install -y docbook-xsl docbook-xml xsltproc doxygen - name: Create user-config.jam run: | - echo "using xsltproc ;" > user-config.jam - echo "using boostbook : /usr/share/xml/docbook/stylesheet/nwalsh : /usr/share/xml/docbook/schema/dtd/4.2 ;" >> user-config.jam - echo "using doxygen : /usr/bin/doxygen ;" >> user-config.jam - echo "using python : 3.12 : /usr/bin/python3 ; " >> user-config.jam + echo "using xsltproc ;" > $HOME/user-config.jam + echo "using boostbook : /usr/share/xml/docbook/stylesheet/nwalsh : /usr/share/xml/docbook/schema/dtd/4.2 ;" >> $HOME/user-config.jam + echo "using doxygen : /usr/bin/doxygen ;" >> $HOME/user-config.jam + echo "using python : 3.12 : /usr/bin/python3 ; " >> $HOME/user-config.jam - uses: actions/checkout@v4 From 6d4129d4d1519d187e4a555635e751ffcf840c8f Mon Sep 17 00:00:00 2001 From: Hans Dembinski Date: Thu, 12 Jun 2025 18:32:06 +0200 Subject: [PATCH 07/10] fix --- .github/workflows/doc.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index cfaee0d9..4548238e 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -44,8 +44,7 @@ jobs: git clone -b $GITHUB_BASE_REF --depth 5 https://github.com/boostorg/boost.git cd boost mv -f $GITHUB_WORKSPACE/* libs/histogram - git submodule update --init --depth 5 tools/build tools/boostdep - git submodule update --init --depth 5 libs/format + git submodule update --init --depth 5 tools/build tools/boostdep tools/quickbook python tools/boostdep/depinst/depinst.py --git_args "--depth 5 --jobs 3" histogram mv -f * $GITHUB_WORKSPACE From 0d34f5d59559f2305f79c68b8840c244a425828d Mon Sep 17 00:00:00 2001 From: Hans Dembinski Date: Thu, 12 Jun 2025 20:57:19 +0200 Subject: [PATCH 08/10] fix --- .github/workflows/doc.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 4548238e..8f8a8f92 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -41,11 +41,9 @@ jobs: - name: Fetch Boost superproject run: | cd .. - git clone -b $GITHUB_BASE_REF --depth 5 https://github.com/boostorg/boost.git + git clone -b $GITHUB_BASE_REF --recursive --depth 5 https://github.com/boostorg/boost.git cd boost mv -f $GITHUB_WORKSPACE/* libs/histogram - git submodule update --init --depth 5 tools/build tools/boostdep tools/quickbook - python tools/boostdep/depinst/depinst.py --git_args "--depth 5 --jobs 3" histogram mv -f * $GITHUB_WORKSPACE - name: Prepare b2 From 6a8cabd794af837c571c13017d33dcac0e5a6344 Mon Sep 17 00:00:00 2001 From: Hans Dembinski Date: Thu, 12 Jun 2025 21:04:12 +0200 Subject: [PATCH 09/10] fix --- .github/workflows/doc.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 8f8a8f92..43573002 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -41,9 +41,12 @@ jobs: - name: Fetch Boost superproject run: | cd .. - git clone -b $GITHUB_BASE_REF --recursive --depth 5 https://github.com/boostorg/boost.git + git clone -b $GITHUB_BASE_REF --depth 5 https://github.com/boostorg/boost.git cd boost mv -f $GITHUB_WORKSPACE/* libs/histogram + git submodule update --init --depth 5 tools/build tools/boostdep + python tools/boostdep/depinst/depinst.py --git_args "--depth 5 --jobs 3" histogram + python tools/boostdep/depinst/depinst.py --git_args "--depth 5 --jobs 3" tools/quickbook mv -f * $GITHUB_WORKSPACE - name: Prepare b2 From a9917a7f4524cbdc6f7fea475ddb7c8d3037cc2c Mon Sep 17 00:00:00 2001 From: Hans Dembinski Date: Thu, 12 Jun 2025 21:14:02 +0200 Subject: [PATCH 10/10] fix --- .github/workflows/doc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 43573002..094cbde0 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -44,9 +44,9 @@ jobs: git clone -b $GITHUB_BASE_REF --depth 5 https://github.com/boostorg/boost.git cd boost mv -f $GITHUB_WORKSPACE/* libs/histogram - git submodule update --init --depth 5 tools/build tools/boostdep + git submodule update --init --depth 5 tools/build tools/boostdep tools/quickbook tools/boostbook python tools/boostdep/depinst/depinst.py --git_args "--depth 5 --jobs 3" histogram - python tools/boostdep/depinst/depinst.py --git_args "--depth 5 --jobs 3" tools/quickbook + python tools/boostdep/depinst/depinst.py --git_args "--depth 5 --jobs 3" ../tools/quickbook mv -f * $GITHUB_WORKSPACE - name: Prepare b2