Skip to content

Commit 093695a

Browse files
ashtumashtum
committed
update ci.yml
1 parent 8f8e1b6 commit 093695a

1 file changed

Lines changed: 15 additions & 36 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 15 additions & 36 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,15 @@ 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
283276
modules-exclude-paths: ''
284277
scan-modules-dir: http-root
285-
scan-modules-ignore: http,capy
278+
patches: https://github.com/cppalliance/capy
286279

287280
- name: ASLR Fix
288281
if: ${{ startsWith(matrix.runs-on, 'ubuntu' )}}
@@ -308,7 +301,6 @@ jobs:
308301
309302
# Remove module from boost-source
310303
rm -r "boost-source/libs/$module" || true
311-
rm -r "boost-source/libs/capy" || true
312304
313305
# Copy cached boost-source to an isolated boost-root
314306
cp -r boost-source boost-root
@@ -322,11 +314,8 @@ jobs:
322314
# Patch boost-root with workspace module
323315
cp -r "$workspace_root"/http-root "libs/$module"
324316
325-
# Patch boost-root with capy dependency
326-
cp -r "$workspace_root"/capy-root "libs/capy"
327-
328317
- name: Boost B2 Workflow
329-
uses: alandefreitas/cpp-actions/b2-workflow@v1.9.0
318+
uses: alandefreitas/cpp-actions/b2-workflow@v1.9.3
330319
if: ${{ !matrix.coverage }}
331320
env:
332321
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 +335,7 @@ jobs:
346335
stop-on-error: true
347336

348337
- name: Boost CMake Workflow
349-
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
338+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.3
350339
if: ${{ matrix.coverage || matrix.build-cmake || matrix.is-earliest }}
351340
with:
352341
source-dir: boost-root
@@ -386,7 +375,7 @@ jobs:
386375
# This causes find_package(Boost COMPONENTS http) to fail because
387376
# boost_httpConfig.cmake is never installed.
388377
- name: Find Package Integration Workflow
389-
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
378+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.3
390379
if: false # ${{ matrix.build-cmake || matrix.is-earliest }}
391380
with:
392381
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
@@ -409,7 +398,7 @@ jobs:
409398
trace-commands: true
410399

411400
- name: Subdirectory Integration Workflow
412-
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
401+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.3
413402
if: ${{ matrix.build-cmake || matrix.is-earliest }}
414403
with:
415404
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
@@ -429,7 +418,7 @@ jobs:
429418
ref-source-dir: boost-root/libs/http/test/cmake_test
430419

431420
- name: Root Project CMake Workflow
432-
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
421+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.3
433422
if: ${{ matrix.build-cmake || matrix.is-earliest }}
434423
with:
435424
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}
@@ -499,7 +488,7 @@ jobs:
499488
fetch-depth: 100
500489

501490
- name: Changelog
502-
uses: alandefreitas/cpp-actions/create-changelog@v1.9.0
491+
uses: alandefreitas/cpp-actions/create-changelog@v1.9.3
503492
with:
504493
thank-non-regular: ${{ startsWith(github.ref, 'refs/tags/') }}
505494
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -517,7 +506,7 @@ jobs:
517506
shell: bash
518507
steps:
519508
- name: Install packages
520-
uses: alandefreitas/cpp-actions/package-install@v1.9.0
509+
uses: alandefreitas/cpp-actions/package-install@v1.9.3
521510
with:
522511
apt-get: git cmake
523512

@@ -526,22 +515,16 @@ jobs:
526515
with:
527516
path: http-root
528517

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-
536518
- name: Clone Boost
537-
uses: alandefreitas/cpp-actions/boost-clone@v1.9.0
519+
uses: alandefreitas/cpp-actions/boost-clone@v1.9.3
538520
id: boost-clone
539521
with:
540522
branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
541523
boost-dir: boost-source
542524
modules-exclude-paths: ''
543525
scan-modules-dir: http-root
544-
scan-modules-ignore: http,capy
526+
patches: >
527+
https://github.com/cppalliance/capy
545528
546529
- name: Patch Boost
547530
id: patch
@@ -562,7 +545,6 @@ jobs:
562545
563546
# Remove module from boost-source
564547
rm -r "boost-source/libs/$module" || true
565-
rm -r "boost-source/libs/capy" || true
566548
567549
# Copy cached boost-source to an isolated boost-root
568550
cp -r boost-source boost-root
@@ -576,9 +558,6 @@ jobs:
576558
# Patch boost-root with workspace module
577559
cp -r "$workspace_root"/http-root "libs/$module"
578560
579-
# Patch boost-root with capy dependency
580-
cp -r "$workspace_root"/capy-root "libs/capy"
581-
582561
- uses: actions/setup-node@v4
583562
with:
584563
node-version: 18

0 commit comments

Comments
 (0)