Skip to content

Commit 1961fa9

Browse files
ashtumashtum
committed
ci.yml: override Node20 in old containers
1 parent bfadd48 commit 1961fa9

1 file changed

Lines changed: 47 additions & 49 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@ jobs:
194194
latest-cxxstd: "20"
195195
cxx: "g++-13"
196196
cc: "gcc-13"
197-
runs-on: "ubuntu-latest"
198-
container: "ubuntu:23.04"
197+
runs-on: "ubuntu-24.04"
199198
b2-toolset: "gcc"
200199
is-latest: true
201200
name: "GCC 13: C++17-20"
@@ -209,8 +208,7 @@ jobs:
209208
latest-cxxstd: "20"
210209
cxx: "g++-13"
211210
cc: "gcc-13"
212-
runs-on: "ubuntu-latest"
213-
container: "ubuntu:23.04"
211+
runs-on: "ubuntu-24.04"
214212
b2-toolset: "gcc"
215213
is-latest: true
216214
name: "GCC 13: C++17-20 (x86)"
@@ -224,8 +222,7 @@ jobs:
224222
latest-cxxstd: "20"
225223
cxx: "g++-13"
226224
cc: "gcc-13"
227-
runs-on: "ubuntu-latest"
228-
container: "ubuntu:23.04"
225+
runs-on: "ubuntu-24.04"
229226
b2-toolset: "gcc"
230227
is-latest: true
231228
name: "GCC 13: C++17-20 (coverage)"
@@ -241,8 +238,7 @@ jobs:
241238
latest-cxxstd: "20"
242239
cxx: "g++-13"
243240
cc: "gcc-13"
244-
runs-on: "ubuntu-latest"
245-
container: "ubuntu:23.04"
241+
runs-on: "ubuntu-24.04"
246242
b2-toolset: "gcc"
247243
is-latest: true
248244
name: "GCC 13: C++17-20 (shared)"
@@ -257,8 +253,7 @@ jobs:
257253
latest-cxxstd: "20"
258254
cxx: "g++-13"
259255
cc: "gcc-13"
260-
runs-on: "ubuntu-latest"
261-
container: "ubuntu:23.04"
256+
runs-on: "ubuntu-24.04"
262257
b2-toolset: "gcc"
263258
is-latest: true
264259
name: "GCC 13: C++17-20 (shared, x86)"
@@ -274,8 +269,7 @@ jobs:
274269
latest-cxxstd: "20"
275270
cxx: "g++-13"
276271
cc: "gcc-13"
277-
runs-on: "ubuntu-latest"
278-
container: "ubuntu:23.04"
272+
runs-on: "ubuntu-24.04"
279273
b2-toolset: "gcc"
280274
is-latest: true
281275
name: "GCC 13: C++17-20 (asan)"
@@ -289,8 +283,7 @@ jobs:
289283
latest-cxxstd: "20"
290284
cxx: "g++-13"
291285
cc: "gcc-13"
292-
runs-on: "ubuntu-latest"
293-
container: "ubuntu:23.04"
286+
runs-on: "ubuntu-24.04"
294287
b2-toolset: "gcc"
295288
is-latest: true
296289
name: "GCC 13: C++17-20 (asan, x86)"
@@ -305,8 +298,7 @@ jobs:
305298
latest-cxxstd: "20"
306299
cxx: "g++-13"
307300
cc: "gcc-13"
308-
runs-on: "ubuntu-latest"
309-
container: "ubuntu:23.04"
301+
runs-on: "ubuntu-24.04"
310302
b2-toolset: "gcc"
311303
is-latest: true
312304
name: "GCC 13: C++17-20 (ubsan)"
@@ -320,8 +312,7 @@ jobs:
320312
latest-cxxstd: "20"
321313
cxx: "g++-13"
322314
cc: "gcc-13"
323-
runs-on: "ubuntu-latest"
324-
container: "ubuntu:23.04"
315+
runs-on: "ubuntu-24.04"
325316
b2-toolset: "gcc"
326317
is-latest: true
327318
name: "GCC 13: C++17-20 (ubsan, x86)"
@@ -433,8 +424,7 @@ jobs:
433424
latest-cxxstd: "20"
434425
cxx: "clang++-17"
435426
cc: "clang-17"
436-
runs-on: "ubuntu-latest"
437-
container: "ubuntu:23.10"
427+
runs-on: "ubuntu-24.04"
438428
b2-toolset: "clang"
439429
is-latest: true
440430
name: "Clang 17: C++17-20"
@@ -448,8 +438,7 @@ jobs:
448438
latest-cxxstd: "20"
449439
cxx: "clang++-17"
450440
cc: "clang-17"
451-
runs-on: "ubuntu-latest"
452-
container: "ubuntu:23.10"
441+
runs-on: "ubuntu-24.04"
453442
b2-toolset: "clang"
454443
is-latest: true
455444
name: "Clang 17: C++17-20 (x86)"
@@ -463,8 +452,7 @@ jobs:
463452
latest-cxxstd: "20"
464453
cxx: "clang++-17"
465454
cc: "clang-17"
466-
runs-on: "ubuntu-latest"
467-
container: "ubuntu:23.10"
455+
runs-on: "ubuntu-24.04"
468456
b2-toolset: "clang"
469457
is-latest: true
470458
name: "Clang 17: C++20 (time-trace)"
@@ -480,8 +468,7 @@ jobs:
480468
latest-cxxstd: "20"
481469
cxx: "clang++-17"
482470
cc: "clang-17"
483-
runs-on: "ubuntu-latest"
484-
container: "ubuntu:23.10"
471+
runs-on: "ubuntu-24.04"
485472
b2-toolset: "clang"
486473
is-latest: true
487474
name: "Clang 17: C++17-20 (asan)"
@@ -495,8 +482,7 @@ jobs:
495482
latest-cxxstd: "20"
496483
cxx: "clang++-17"
497484
cc: "clang-17"
498-
runs-on: "ubuntu-latest"
499-
container: "ubuntu:23.10"
485+
runs-on: "ubuntu-24.04"
500486
b2-toolset: "clang"
501487
is-latest: true
502488
name: "Clang 17: C++17-20 (asan, x86)"
@@ -511,8 +497,7 @@ jobs:
511497
latest-cxxstd: "20"
512498
cxx: "clang++-17"
513499
cc: "clang-17"
514-
runs-on: "ubuntu-latest"
515-
container: "ubuntu:23.10"
500+
runs-on: "ubuntu-24.04"
516501
b2-toolset: "clang"
517502
is-latest: true
518503
name: "Clang 17: C++17-20 (ubsan)"
@@ -526,8 +511,7 @@ jobs:
526511
latest-cxxstd: "20"
527512
cxx: "clang++-17"
528513
cc: "clang-17"
529-
runs-on: "ubuntu-latest"
530-
container: "ubuntu:23.10"
514+
runs-on: "ubuntu-24.04"
531515
b2-toolset: "clang"
532516
is-latest: true
533517
name: "Clang 17: C++17-20 (ubsan, x86)"
@@ -542,8 +526,7 @@ jobs:
542526
latest-cxxstd: "20"
543527
cxx: "clang++-16"
544528
cc: "clang-16"
545-
runs-on: "ubuntu-latest"
546-
container: "ubuntu:23.04"
529+
runs-on: "ubuntu-24.04"
547530
install: "cmake"
548531
b2-toolset: "clang"
549532
name: "Clang 16: C++17-20"
@@ -709,14 +692,28 @@ jobs:
709692
name: ${{ matrix.name }}
710693
runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)[matrix.runs-on] }}
711694
container:
712-
image: ${{ matrix.container }}
695+
image: ${{matrix.container}}
713696
options: --privileged
697+
volumes:
698+
- /node20217:/node20217:rw,rshared
699+
- ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}
714700
timeout-minutes: 120
715701

716702
steps:
717-
- name: Enable Node 16
703+
- name: install nodejs20glibc2.17
704+
if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
705+
run: |
706+
apt-get update
707+
apt-get -yqq install xz-utils curl
708+
curl -LO https://unofficial-builds.nodejs.org/download/release/v20.9.0/node-v20.9.0-linux-x64-glibc-217.tar.xz
709+
tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
710+
ldd /__e/node20/bin/node
711+
712+
- name: install git
713+
if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
718714
run: |
719-
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
715+
apt-get update
716+
apt-get -yqq install git
720717
721718
- name: ASLR Fix
722719
if: ${{ startsWith(matrix.runs-on, 'ubuntu' )}}
@@ -742,7 +739,7 @@ jobs:
742739
ref: develop
743740

744741
- name: Setup C++
745-
uses: alandefreitas/cpp-actions/setup-cpp@v1.8.0
742+
uses: alandefreitas/cpp-actions/setup-cpp@v1.8.7
746743
id: setup-cpp
747744
with:
748745
compiler: ${{ matrix.compiler }}
@@ -751,7 +748,7 @@ jobs:
751748
trace-commands: true
752749

753750
- name: Install packages
754-
uses: alandefreitas/cpp-actions/package-install@v1.8.0
751+
uses: alandefreitas/cpp-actions/package-install@v1.8.7
755752
id: package-install
756753
with:
757754
apt-get-add-architecture: 'i386'
@@ -761,7 +758,7 @@ jobs:
761758
build-essential
762759
763760
- name: Clone Boost
764-
uses: alandefreitas/cpp-actions/boost-clone@v1.8.0
761+
uses: alandefreitas/cpp-actions/boost-clone@v1.8.7
765762
id: boost-clone
766763
with:
767764
branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
@@ -770,7 +767,7 @@ jobs:
770767
scan-modules-ignore: http_io
771768

772769
- name: Install packages (Windows)
773-
uses: alandefreitas/cpp-actions/package-install@v1.8.0
770+
uses: alandefreitas/cpp-actions/package-install@v1.8.7
774771
if: ${{ startsWith(matrix.runs-on, 'windows') }}
775772
id: package-install-windows
776773
with:
@@ -830,12 +827,13 @@ jobs:
830827
echo -E "boost_root=$boost_root" >> $GITHUB_OUTPUT
831828
832829
# Patch boost-root with workspace module
833-
cp -r "$workspace_root"/http-io-root "libs/$module"
834830
cp -r "$workspace_root"/buffers-root libs/buffers
835831
cp -r "$workspace_root"/http-proto-root libs/http_proto
832+
cp -r "$workspace_root"/http-io-root "libs/$module"
836833
837834
python3 tools/boostdep/depinst/depinst.py buffers
838835
python3 tools/boostdep/depinst/depinst.py http_proto
836+
python3 tools/boostdep/depinst/depinst.py "$module"
839837
840838
- name: Boost B2 Workflow
841839
uses: alandefreitas/cpp-actions/b2-workflow@v1.7.0
@@ -857,7 +855,7 @@ jobs:
857855
stop-on-error: true
858856

859857
- name: Boost CMake Workflow
860-
uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.0
858+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.7
861859
if: ${{ matrix.coverage || matrix.time-trace || matrix.build-cmake || matrix.is-earliest }}
862860
with:
863861
source-dir: boost-root
@@ -894,7 +892,7 @@ jobs:
894892
echo "LD_LIBRARY_PATH=$GITHUB_WORKSPACE/.local/lib:$LD_LIBRARY_PATH" >> "$GITHUB_ENV"
895893
896894
- name: Find Package Integration Workflow
897-
uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.0
895+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.7
898896
if: ${{ matrix.build-cmake || matrix.is-earliest }}
899897
with:
900898
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
@@ -918,7 +916,7 @@ jobs:
918916
toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
919917

920918
- name: Subdirectory Integration Workflow
921-
uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.0
919+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.7
922920
if: ${{ matrix.build-cmake || matrix.is-earliest }}
923921
with:
924922
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
@@ -939,7 +937,7 @@ jobs:
939937
toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
940938

941939
- name: Root Project CMake Workflow
942-
uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.0
940+
uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.7
943941
if: ${{ matrix.build-cmake || matrix.is-earliest }}
944942
with:
945943
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}
@@ -963,7 +961,7 @@ jobs:
963961
toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
964962

965963
- name: FlameGraph
966-
uses: alandefreitas/cpp-actions/flamegraph@v1.8.0
964+
uses: alandefreitas/cpp-actions/flamegraph@v1.8.7
967965
if: matrix.time-trace
968966
with:
969967
source-dir: boost-root/libs/http_io
@@ -1005,7 +1003,7 @@ jobs:
10051003
shell: bash
10061004

10071005
name: Changelog Summary
1008-
runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)['ubuntu-22.04'] }}
1006+
runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)['ubuntu-24.04'] }}
10091007
timeout-minutes: 120
10101008

10111009
steps:
@@ -1016,7 +1014,7 @@ jobs:
10161014
fetch-depth: 100
10171015

10181016
- name: Changelog
1019-
uses: alandefreitas/cpp-actions/create-changelog@v1.8.0
1017+
uses: alandefreitas/cpp-actions/create-changelog@v1.8.7
10201018
with:
10211019
thank-non-regular: ${{ startsWith(github.ref, 'refs/tags/') }}
10221020
github-token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)