Skip to content

chore: use boost-clone patches option #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ashtum wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

chore: use boost-clone patches option #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 18 additions & 34 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,15 +864,8 @@ jobs:
with:
path: buffers-root

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

- name: Setup C++
uses: alandefreitas/cpp-actions/[email protected].0
uses: alandefreitas/cpp-actions/[email protected].2
id: setup-cpp
with:
compiler: ${{ matrix.compiler }}
Expand All @@ -881,26 +874,24 @@ jobs:
trace-commands: true

- name: Install packages
uses: alandefreitas/cpp-actions/[email protected].0
uses: alandefreitas/cpp-actions/[email protected].2
id: package-install
with:
apt-get: >-
${{ matrix.install }}
build-essential

- name: Clone Boost
uses: alandefreitas/cpp-actions/[email protected].0
uses: alandefreitas/cpp-actions/[email protected].2
id: boost-clone
with:
branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
boost-dir: boost-source
modules-exclude-paths: ''
scan-modules-dir: |
buffers-root
capy-root
scan-modules-ignore: |
buffers
capy
scan-modules-dir: buffers-root
scan-modules-ignore: buffers
patches: |
https://github.com/cppalliance/capy

- name: Patch Boost
id: patch
Expand Down Expand Up @@ -933,10 +924,9 @@ jobs:

# Patch boost-root with workspace module
cp -r "$workspace_root"/buffers-root "libs/$module"
cp -r "$workspace_root"/capy-root libs/capy

- name: Boost B2 Workflow
uses: alandefreitas/cpp-actions/[email protected].0
uses: alandefreitas/cpp-actions/[email protected].2
if: ${{ !matrix.coverage && !matrix.time-trace }}
with:
source-dir: boost-root
Expand All @@ -954,7 +944,7 @@ jobs:
stop-on-error: true

- name: Boost CMake Workflow
uses: alandefreitas/cpp-actions/[email protected].0
uses: alandefreitas/cpp-actions/[email protected].2
if: ${{ matrix.coverage || matrix.time-trace || matrix.build-cmake || matrix.is-earliest }}
with:
source-dir: boost-root
Expand Down Expand Up @@ -991,7 +981,7 @@ jobs:
echo "LD_LIBRARY_PATH=$GITHUB_WORKSPACE/.local/lib:$LD_LIBRARY_PATH" >> "$GITHUB_ENV"

# - name: Find Package Integration Workflow
# uses: alandefreitas/cpp-actions/[email protected].0
# uses: alandefreitas/cpp-actions/[email protected].2
# if: ${{ matrix.build-cmake || matrix.is-earliest }}
# with:
# source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
Expand All @@ -1014,7 +1004,7 @@ jobs:
# trace-commands: true

# - name: Subdirectory Integration Workflow
# uses: alandefreitas/cpp-actions/[email protected].0
# uses: alandefreitas/cpp-actions/[email protected].2
# if: ${{ matrix.build-cmake || matrix.is-earliest }}
# with:
# source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
Expand All @@ -1034,7 +1024,7 @@ jobs:
# ref-source-dir: boost-root/libs/buffers/test/cmake_test

- name: Root Project CMake Workflow
uses: alandefreitas/cpp-actions/[email protected].0
uses: alandefreitas/cpp-actions/[email protected].2
if: ${{ matrix.build-cmake || matrix.is-earliest }}
with:
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}
Expand All @@ -1058,7 +1048,7 @@ jobs:
toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}

- name: FlameGraph
uses: alandefreitas/cpp-actions/[email protected].0
uses: alandefreitas/cpp-actions/[email protected].2
if: matrix.time-trace
with:
source-dir: boost-root/libs/buffers
Expand Down Expand Up @@ -1111,7 +1101,7 @@ jobs:
fetch-depth: 100

- name: Changelog
uses: alandefreitas/cpp-actions/[email protected].0
uses: alandefreitas/cpp-actions/[email protected].2
with:
thank-non-regular: ${{ startsWith(github.ref, 'refs/tags/') }}
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -1134,7 +1124,7 @@ jobs:
shell: bash
steps:
- name: Install packages
uses: alandefreitas/cpp-actions/[email protected].0
uses: alandefreitas/cpp-actions/[email protected].2
with:
apt-get: git cmake

Expand All @@ -1143,22 +1133,17 @@ jobs:
with:
path: buffers-root

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

- name: Clone Boost
uses: alandefreitas/cpp-actions/[email protected].0
uses: alandefreitas/cpp-actions/[email protected].2
id: boost-clone
with:
branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
boost-dir: boost-source
modules-exclude-paths: ''
scan-modules-dir: buffers-root
scan-modules-ignore: buffers
patches: |
https://github.com/cppalliance/capy

- name: Patch Boost
id: patch
Expand Down Expand Up @@ -1191,7 +1176,6 @@ jobs:

# Patch boost-root with workspace module
cp -r "$workspace_root"/buffers-root "libs/$module"
cp -r "$workspace_root"/capy-root libs/capy

- uses: actions/setup-node@v4
with:
Expand Down
Loading