Skip to content

Commit b7cff74

Browse files
ashtumashtum
committed
update ci.yml
1 parent 2e45aeb commit b7cff74

File tree

1 file changed

+19
-39
lines changed

1 file changed

+19
-39
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 19 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -242,13 +242,13 @@ jobs:
242242
timeout-minutes: 120
243243

244244
steps:
245-
- name: Clone Boost.Corosio
245+
- name: Clone Boost.Http
246246
uses: actions/checkout@v4
247247
with:
248248
path: http-root
249249

250250
- name: Setup C++
251-
uses: alandefreitas/cpp-actions/setup-cpp@v1.9.0
251+
uses: alandefreitas/cpp-actions/setup-cpp@v1.9.3
252252
id: setup-cpp
253253
with:
254254
compiler: ${{ matrix.compiler }}
@@ -257,7 +257,7 @@ jobs:
257257
trace-commands: true
258258

259259
- name: Install packages
260-
uses: alandefreitas/cpp-actions/package-install@v1.9.0
260+
uses: alandefreitas/cpp-actions/package-install@v1.9.3
261261
id: package-install
262262
with:
263263
apt-get-add-architecture: ${{ matrix.x86 && 'i386' || '' }}
@@ -267,22 +267,16 @@ jobs:
267267
zlib1g-dev libbrotli-dev
268268
${{ matrix.x86 && 'zlib1g-dev:i386 libbrotli-dev:i386' || '' }}
269269
270-
- name: Clone Capy
271-
uses: actions/checkout@v4
272-
with:
273-
repository: cppalliance/capy
274-
ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
275-
path: capy-root
276-
277270
- name: Clone Boost
278-
uses: alandefreitas/cpp-actions/boost-clone@v1.9.0
271+
uses: alandefreitas/cpp-actions/boost-clone@v1.9.3
279272
id: boost-clone
280273
with:
281274
branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
282275
boost-dir: boost-source
283-
modules-exclude-paths: ''
276+
modules-exclude-paths: '-'
284277
scan-modules-dir: http-root
285-
scan-modules-ignore: http,capy
278+
patches: >
279+
https://github.com/cppalliance/capy
286280
287281
- name: ASLR Fix
288282
if: ${{ startsWith(matrix.runs-on, 'ubuntu' )}}
@@ -308,7 +302,6 @@ jobs:
308302
309303
# Remove module from boost-source
310304
rm -r "boost-source/libs/$module" || true
311-
rm -r "boost-source/libs/capy" || true
312305
313306
# Copy cached boost-source to an isolated boost-root
314307
cp -r boost-source boost-root
@@ -322,11 +315,8 @@ jobs:
322315
# Patch boost-root with workspace module
323316
cp -r "$workspace_root"/http-root "libs/$module"
324317
325-
# Patch boost-root with capy dependency
326-
cp -r "$workspace_root"/capy-root "libs/capy"
327-
328318
- name: Boost B2 Workflow
329-
uses: alandefreitas/cpp-actions/b2-workflow@v1.9.0
319+
uses: alandefreitas/cpp-actions/b2-workflow@v1.9.3
330320
if: ${{ !matrix.coverage }}
331321
env:
332322
ASAN_OPTIONS: ${{ ((matrix.compiler == 'apple-clang' || matrix.compiler == 'clang') && 'detect_invalid_pointer_pairs=0:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1') || 'detect_invalid_pointer_pairs=2:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1' }}
@@ -346,7 +336,7 @@ jobs:
346336
stop-on-error: true
347337

348338
- name: Boost CMake Workflow
349-
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
339+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.3
350340
if: ${{ matrix.coverage || matrix.build-cmake || matrix.is-earliest }}
351341
with:
352342
source-dir: boost-root
@@ -386,7 +376,7 @@ jobs:
386376
# This causes find_package(Boost COMPONENTS http) to fail because
387377
# boost_httpConfig.cmake is never installed.
388378
- name: Find Package Integration Workflow
389-
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
379+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.3
390380
if: false # ${{ matrix.build-cmake || matrix.is-earliest }}
391381
with:
392382
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
@@ -409,7 +399,7 @@ jobs:
409399
trace-commands: true
410400

411401
- name: Subdirectory Integration Workflow
412-
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
402+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.3
413403
if: ${{ matrix.build-cmake || matrix.is-earliest }}
414404
with:
415405
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
@@ -429,7 +419,7 @@ jobs:
429419
ref-source-dir: boost-root/libs/http/test/cmake_test
430420

431421
- name: Root Project CMake Workflow
432-
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
422+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.3
433423
if: ${{ matrix.build-cmake || matrix.is-earliest }}
434424
with:
435425
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}
@@ -492,14 +482,14 @@ jobs:
492482
timeout-minutes: 120
493483

494484
steps:
495-
- name: Clone Boost.Corosio
485+
- name: Clone Boost.Http
496486
uses: actions/checkout@v4
497487
with:
498488
# Avoid the common API rate limit exceeded error in boostorg by including 100 latest commits in any case
499489
fetch-depth: 100
500490

501491
- name: Changelog
502-
uses: alandefreitas/cpp-actions/create-changelog@v1.9.0
492+
uses: alandefreitas/cpp-actions/create-changelog@v1.9.3
503493
with:
504494
thank-non-regular: ${{ startsWith(github.ref, 'refs/tags/') }}
505495
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -517,7 +507,7 @@ jobs:
517507
shell: bash
518508
steps:
519509
- name: Install packages
520-
uses: alandefreitas/cpp-actions/package-install@v1.9.0
510+
uses: alandefreitas/cpp-actions/package-install@v1.9.3
521511
with:
522512
apt-get: git cmake
523513

@@ -526,22 +516,16 @@ jobs:
526516
with:
527517
path: http-root
528518

529-
- name: Clone Capy
530-
uses: actions/checkout@v4
531-
with:
532-
repository: cppalliance/capy
533-
ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
534-
path: capy-root
535-
536519
- name: Clone Boost
537-
uses: alandefreitas/cpp-actions/boost-clone@v1.9.0
520+
uses: alandefreitas/cpp-actions/boost-clone@v1.9.3
538521
id: boost-clone
539522
with:
540523
branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
541524
boost-dir: boost-source
542-
modules-exclude-paths: ''
525+
modules-exclude-paths: '-'
543526
scan-modules-dir: http-root
544-
scan-modules-ignore: http,capy
527+
patches: >
528+
https://github.com/cppalliance/capy
545529
546530
- name: Patch Boost
547531
id: patch
@@ -562,7 +546,6 @@ jobs:
562546
563547
# Remove module from boost-source
564548
rm -r "boost-source/libs/$module" || true
565-
rm -r "boost-source/libs/capy" || true
566549
567550
# Copy cached boost-source to an isolated boost-root
568551
cp -r boost-source boost-root
@@ -576,9 +559,6 @@ jobs:
576559
# Patch boost-root with workspace module
577560
cp -r "$workspace_root"/http-root "libs/$module"
578561
579-
# Patch boost-root with capy dependency
580-
cp -r "$workspace_root"/capy-root "libs/capy"
581-
582562
- uses: actions/setup-node@v4
583563
with:
584564
node-version: 18

0 commit comments

Comments
 (0)