Skip to content

Commit daf37da

Browse files
committed
update ci.yml
1 parent fcad5fb commit daf37da

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,9 @@ jobs:
208208
version: "*"
209209
cxx: "clang++"
210210
cc: "clang"
211-
runs-on: "macos-13"
211+
runs-on: "macos-26"
212212
b2-toolset: "clang"
213-
name: "Apple-Clang (macOS 13)"
213+
name: "Apple-Clang (macOS 26)"
214214
shared: true
215215
build-type: "Release"
216216
build-cmake: true
@@ -848,7 +848,7 @@ jobs:
848848
ref: develop
849849

850850
- name: Setup C++
851-
uses: ashtum/cpp-actions/setup-cpp@v1.8.13
851+
uses: alandefreitas/cpp-actions/setup-cpp@v1.9.0
852852
id: setup-cpp
853853
with:
854854
compiler: ${{ matrix.compiler }}
@@ -857,7 +857,7 @@ jobs:
857857
trace-commands: true
858858

859859
- name: Install packages
860-
uses: ashtum/cpp-actions/package-install@v1.8.13
860+
uses: alandefreitas/cpp-actions/package-install@v1.9.0
861861
id: package-install
862862
with:
863863
apt-get-add-architecture: ${{ matrix.x86 && 'i386' || '' }}
@@ -867,12 +867,11 @@ jobs:
867867
${{ matrix.x86 && 'libssl-dev:i386 zlib1g-dev:i386 libbrotli-dev:i386 libpsl-dev:i386' || '' }}
868868
869869
- name: Clone Boost
870-
uses: ashtum/cpp-actions/boost-clone@v1.8.13
870+
uses: alandefreitas/cpp-actions/boost-clone@v1.9.0
871871
id: boost-clone
872872
with:
873873
branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
874874
boost-dir: boost-source
875-
cache: false
876875
modules-exclude-paths: ''
877876
scan-modules-dir: |
878877
http-io-root
@@ -886,7 +885,7 @@ jobs:
886885
rts
887886
888887
- name: Install Packages (Windows)
889-
uses: ashtum/cpp-actions/package-install@v1.8.13
888+
uses: alandefreitas/cpp-actions/package-install@v1.9.0
890889
if: ${{ startsWith(matrix.runs-on, 'windows') }}
891890
id: package-install-windows
892891
with:
@@ -963,7 +962,7 @@ jobs:
963962
cp -r "$workspace_root"/rts-root libs/rts
964963
965964
- name: Boost B2 Workflow
966-
uses: ashtum/cpp-actions/b2-workflow@v1.8.13
965+
uses: alandefreitas/cpp-actions/b2-workflow@v1.9.0
967966
if: ${{ !matrix.coverage && !matrix.time-trace }}
968967
env:
969968
ASAN_OPTIONS: ${{ (startsWith(matrix.compiler, 'apple-clang') && 'detect_invalid_pointer_pairs=0') || 'detect_invalid_pointer_pairs=2' }}
@@ -985,7 +984,7 @@ jobs:
985984
extra-args: "libs/beast2/example" # https://github.com/ashtum/cpp-actions/issues/23
986985

987986
- name: Boost CMake Workflow
988-
uses: ashtum/cpp-actions/cmake-workflow@v1.8.13
987+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
989988
if: ${{ matrix.coverage || matrix.time-trace || matrix.build-cmake || matrix.is-earliest }}
990989
with:
991990
source-dir: boost-root
@@ -1022,7 +1021,7 @@ jobs:
10221021
echo "LD_LIBRARY_PATH=$GITHUB_WORKSPACE/.local/lib:$LD_LIBRARY_PATH" >> "$GITHUB_ENV"
10231022
10241023
- name: Find Package Integration Workflow
1025-
uses: ashtum/cpp-actions/cmake-workflow@v1.8.13
1024+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
10261025
if: ${{ matrix.build-cmake || matrix.is-earliest }}
10271026
with:
10281027
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
@@ -1046,7 +1045,7 @@ jobs:
10461045
toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
10471046

10481047
- name: Subdirectory Integration Workflow
1049-
uses: ashtum/cpp-actions/cmake-workflow@v1.8.13
1048+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
10501049
if: ${{ matrix.build-cmake || matrix.is-earliest }}
10511050
with:
10521051
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
@@ -1067,7 +1066,7 @@ jobs:
10671066
toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
10681067

10691068
- name: Root Project CMake Workflow
1070-
uses: ashtum/cpp-actions/cmake-workflow@v1.8.13
1069+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
10711070
if: ${{ matrix.build-cmake || matrix.is-earliest }}
10721071
with:
10731072
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}
@@ -1090,7 +1089,7 @@ jobs:
10901089
toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
10911090

10921091
- name: FlameGraph
1093-
uses: ashtum/cpp-actions/flamegraph@v1.8.13
1092+
uses: alandefreitas/cpp-actions/flamegraph@v1.9.0
10941093
if: matrix.time-trace
10951094
with:
10961095
source-dir: boost-root/libs/beast2
@@ -1143,7 +1142,7 @@ jobs:
11431142
fetch-depth: 100
11441143

11451144
- name: Changelog
1146-
uses: ashtum/cpp-actions/create-changelog@v1.8.13
1145+
uses: alandefreitas/cpp-actions/create-changelog@v1.9.0
11471146
with:
11481147
thank-non-regular: ${{ startsWith(github.ref, 'refs/tags/') }}
11491148
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -1165,7 +1164,7 @@ jobs:
11651164
shell: bash
11661165
steps:
11671166
- name: Install packages
1168-
uses: ashtum/cpp-actions/package-install@v1.8.13
1167+
uses: alandefreitas/cpp-actions/package-install@v1.9.0
11691168
with:
11701169
apt-get: git cmake
11711170

@@ -1196,12 +1195,11 @@ jobs:
11961195
ref: develop
11971196

11981197
- name: Clone Boost
1199-
uses: ashtum/cpp-actions/boost-clone@v1.8.13
1198+
uses: alandefreitas/cpp-actions/boost-clone@v1.9.0
12001199
id: boost-clone
12011200
with:
12021201
branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
12031202
boost-dir: boost-source
1204-
cache: false
12051203
modules-exclude-paths: ''
12061204
scan-modules-dir: |
12071205
http-io-root

build/Jamfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ project boost/beast2
3131
$(c11-requires)
3232
<link>shared:<define>BOOST_BEAST2_DYN_LINK=1
3333
<link>static:<define>BOOST_BEAST2_STATIC_LINK=1
34+
<toolset>clang-win:<cxxflags>"-Wno-unused-private-field"
3435

3536
#TODO: Remove the following defines once asio headers are no longer included in source files
3637
<target-os>windows:<define>_WIN32_WINNT=0x0601

0 commit comments

Comments
 (0)