Skip to content

Commit

Permalink
Fix doc build script
Browse files Browse the repository at this point in the history
  • Loading branch information
ashtum committed Apr 23, 2024
1 parent 8ddfd65 commit 2f812b7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 58 deletions.
63 changes: 5 additions & 58 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1012,6 +1012,9 @@ jobs:
needs: [ runner-selection ]
runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)['ubuntu-latest'] }}
steps:
- name: Clone Http.Proto
uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
node-version: 18
Expand All @@ -1023,69 +1026,13 @@ jobs:
compiler: clang
version: 17

- name: Clone Http.Proto
uses: actions/checkout@v3
with:
path: http-proto-root

- name: Clone Boost.Buffers
uses: actions/checkout@v3
with:
path: buffers-root
repository: cppalliance/buffers
ref: develop

- name: Clone Boost
uses: alandefreitas/cpp-actions/[email protected]
id: boost-clone
with:
branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
boost-dir: boost-source
scan-modules-dir: http-proto-root
scan-modules-ignore: http_proto

- name: Patch Boost
id: patch
shell: bash
run: |
set -xe
pwd
ls
ls -lah boost-source
# Identify boost module being tested
module=${GITHUB_REPOSITORY#*/}
echo "module=$module" >> $GITHUB_OUTPUT
# Identify GitHub workspace root
workspace_root=$(echo "$GITHUB_WORKSPACE" | sed 's/\\/\//g')
echo -E "workspace_root=$workspace_root" >> $GITHUB_OUTPUT
# Remove module from boost-source
rm -r "boost-source/libs/$module" || true
# Copy cached boost-source to an isolated boost-root
cp -r boost-source boost-root
# Set boost-root output
cd boost-root
boost_root="$(pwd)"
boost_root=$(echo "$boost_root" | sed 's/\\/\//g')
echo -E "boost_root=$boost_root" >> $GITHUB_OUTPUT
# Patch boost-root with workspace module
cp -r "$workspace_root"/http-proto-root "libs/$module"
cp -r "$workspace_root"/buffers-root libs/buffers
python3 tools/boostdep/depinst/depinst.py buffers
- name: Build Antora Docs
run: |
cd boost-root/libs/http_proto/doc
cd doc
bash ./build_antora.sh
- name: Create Antora Docs Artifact
uses: actions/upload-artifact@v3
with:
name: antora-docs
path: boost-root/libs/http_proto/doc/build/site
path: doc/build/site
6 changes: 6 additions & 0 deletions doc/generate-files.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,12 @@ if (isBoostDir(cwdParentParent)) {
execSync('git submodule update --init --recursive', {cwd: boostDir})
console.log(`Cloned Boost to ${boostDir}`)

// Clone buffers
if (!fs.existsSync(path.join(boostDir, 'libs', 'buffers'))){
execSync(`git clone https://github.com/CPPAlliance/buffers --depth 1 --branch ${boostBranch}`,
{ cwd: path.join(boostDir, 'libs') })
}

// Delete `self` from boost/libs
const selfDir = path.join(boostDir, 'libs', self)
console.log(`Deleting ${selfDir}`)
Expand Down

0 comments on commit 2f812b7

Please sign in to comment.