Update ci.yml

Apply Node20 workaround
Update ci.yml
2026-01-20 04:32:44 +00:00 · 2024-12-13 22:38:40 +02:00 · 2024-12-13 22:36:00 +02:00 · 2024-12-13 22:35:11 +02:00 · 2024-12-13 22:33:25 +02:00 · 2024-08-27 14:07:08 +03:00
6 changed files with 84 additions and 31 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,17 +44,21 @@ jobs:
            install: g++-10
          - toolset: gcc-11
            cxxstd: "03,11,14,17,2a"
-            os: ubuntu-20.04
-            install: g++-11
+            os: ubuntu-22.04
          - toolset: gcc-12
            cxxstd: "03,11,14,17,20,2b"
            os: ubuntu-22.04
            install: g++-12
          - toolset: gcc-13
            cxxstd: "03,11,14,17,20,2b"
-            container: ubuntu:23.04
+            container: ubuntu:24.04
            os: ubuntu-latest
            install: g++-13
+          - toolset: gcc-14
+            cxxstd: "03,11,14,17,20,2b"
+            container: ubuntu:24.04
+            os: ubuntu-latest
+            install: g++-14
          - toolset: clang
            compiler: clang++-3.9
            cxxstd: "03,11,14"
@@ -126,40 +130,64 @@ jobs:
          - toolset: clang
            compiler: clang++-16
            cxxstd: "03,11,14,17,20,2b"
-            container: ubuntu:23.04
+            container: ubuntu:24.04
            os: ubuntu-latest
            install: clang-16
          - toolset: clang
            compiler: clang++-17
            cxxstd: "03,11,14,17,20,2b"
-            container: ubuntu:23.10
+            container: ubuntu:24.04
            os: ubuntu-latest
            install: clang-17
          - toolset: clang
-            cxxstd: "03,11,14,17,2a"
-            os: macos-11
-          - toolset: clang
+            compiler: clang++-18
            cxxstd: "03,11,14,17,20,2b"
-            os: macos-12
+            container: ubuntu:24.04
+            os: ubuntu-latest
+            install: clang-18
+          - toolset: clang
+            compiler: clang++-19
+            cxxstd: "03,11,14,17,20,2b"
+            container: ubuntu:24.10
+            os: ubuntu-latest
+            install: clang-19
          - toolset: clang
            cxxstd: "03,11,14,17,20,2b"
            os: macos-13
+          - toolset: clang
+            cxxstd: "03,11,14,17,20,2b"
+            os: macos-14
+          - toolset: clang
+            cxxstd: "03,11,14,17,20,2b"
+            os: macos-15

    runs-on: ${{matrix.os}}
-    container: ${{matrix.container}}
+
+    container:
+      image: ${{matrix.container}}
+      volumes:
+        - /node20217:/node20217:rw,rshared
+        - ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}

    defaults:
      run:
        shell: bash

    steps:
-      - uses: actions/checkout@v3
-
      - name: Setup container environment
        if: matrix.container
        run: |
          apt-get update
-          apt-get -y install sudo python3 git g++
+          apt-get -y install sudo python3 git g++ curl xz-utils
+
+      - name: Install nodejs20glibc2.17
+        if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
+        run: |
+          curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz
+          tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
+          ldd /__e/node20/bin/node
+
+      - uses: actions/checkout@v4

      - name: Install packages
        if: matrix.install
@@ -226,7 +254,7 @@ jobs:
    runs-on: ${{matrix.os}}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Setup Boost
        shell: cmd
@@ -263,14 +291,15 @@ jobs:
        include:
          - os: ubuntu-20.04
          - os: ubuntu-22.04
-          - os: macos-11
-          - os: macos-12
+          - os: ubuntu-24.04
          - os: macos-13
+          - os: macos-14
+          - os: macos-15

    runs-on: ${{matrix.os}}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Install packages
        if: matrix.install
@@ -311,14 +340,15 @@ jobs:
        include:
          - os: ubuntu-20.04
          - os: ubuntu-22.04
-          - os: macos-11
-          - os: macos-12
+          - os: ubuntu-24.04
          - os: macos-13
+          - os: macos-14
+          - os: macos-15

    runs-on: ${{matrix.os}}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Install packages
        if: matrix.install
@@ -369,14 +399,15 @@ jobs:
        include:
          - os: ubuntu-20.04
          - os: ubuntu-22.04
-          - os: macos-11
-          - os: macos-12
+          - os: ubuntu-24.04
          - os: macos-13
+          - os: macos-14
+          - os: macos-15

    runs-on: ${{matrix.os}}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Install packages
        if: matrix.install
@@ -429,7 +460,7 @@ jobs:
    runs-on: ${{matrix.os}}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Setup Boost
        shell: cmd
@@ -478,7 +509,7 @@ jobs:
    runs-on: ${{matrix.os}}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Setup Boost
        shell: cmd
@@ -545,7 +576,7 @@ jobs:
    runs-on: ${{matrix.os}}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Setup Boost
        shell: cmd
--- a/build.jam
+++ b/build.jam
@@ -0,0 +1,16 @@
+# Copyright 2023-2024 René Ferdinand Rivera Morell
+# Copyright 2024 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# https://www.boost.org/LICENSE_1_0.txt
+
+require-b2 5.2 ;
+
+project /boost/lambda2 ;
+
+explicit
+    [ alias boost_lambda2 : : : : <include>include <library>$(boost_dependencies) ]
+    [ alias all : boost_lambda2 test ]
+    ;
+
+call-if : boost-library lambda2
+    ;
--- a/include/boost/lambda2/lambda2.hpp
+++ b/include/boost/lambda2/lambda2.hpp
@@ -14,7 +14,7 @@

 // Same format as BOOST_VERSION:
 //   major * 100000 + minor * 100 + patch
-#define BOOST_LAMBDA2_VERSION 108600
+#define BOOST_LAMBDA2_VERSION 108800

 namespace boost
 {
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -2,10 +2,15 @@
 # Distributed under the Boost Software License, Version 1.0.
 # https://www.boost.org/LICENSE_1_0.txt

+import-search /boost/config/checks ;
+
 import testing ;
-import ../../config/checks/config : requires ;
+import config : requires ;

 project : requirements
+  <library>/boost/lambda2//boost_lambda2
+  <library>/boost/config//boost_config
+  <library>/boost/core//boost_core

  <warnings>extra

@@ -13,7 +18,8 @@ project : requirements

  <toolset>msvc:<warnings-as-errors>on
  <toolset>clang:<warnings-as-errors>on
-  <toolset>gcc:<warnings-as-errors>on ;
+  <toolset>gcc:<warnings-as-errors>on
+;

 run quick.cpp ;
 run lambda2_test.cpp ;
--- a/test/cmake_install_test/CMakeLists.txt
+++ b/test/cmake_install_test/CMakeLists.txt
@@ -14,4 +14,4 @@ target_link_libraries(quick Boost::lambda2)
 enable_testing()
 add_test(quick quick)

-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
+add_custom_target(check VERBATIM COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
--- a/test/cmake_subdir_test/CMakeLists.txt
+++ b/test/cmake_subdir_test/CMakeLists.txt
@@ -14,4 +14,4 @@ target_link_libraries(quick Boost::lambda2)
 enable_testing()
 add_test(quick quick)

-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
+add_custom_target(check VERBATIM COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
Author	SHA1	Message	Date
Peter Dimov	865eb98c9c	Update ci.yml	2024-12-13 22:38:40 +02:00
Peter Dimov	8466c546e5	Apply Node20 workaround	2024-12-13 22:36:00 +02:00
Peter Dimov	6ebe42d4ac	Update ci.yml	2024-12-13 22:35:11 +02:00
Peter Dimov	cb2e51eb84	Update version	2024-12-13 22:33:25 +02:00
Peter Dimov	f1d863c6b2	Add VERBATIM to add_custom_target	2024-08-27 14:07:08 +03:00
Peter Dimov	3fb266bf57	Update build.jam, test/Jamfile	2024-08-27 13:59:28 +03:00
Rene Rivera	3d7778f2a9	Sync from upstream.	2024-08-17 09:06:33 -05:00
Peter Dimov	97f43720a1	Update ci.yml	2024-08-17 11:53:49 +03:00
Peter Dimov	3a982bf019	Update version	2024-08-17 04:22:04 +03:00
Rene Rivera	a03806e4ec	Move inter-lib dependencies to a project variable and into the build targets.	2024-07-23 22:34:24 -05:00
Rene Rivera	53bbeac521	Update copyright dates.	2024-07-20 22:52:05 -05:00
Rene Rivera	ad47d9ed4f	Change all <source> references to <library>.	2024-07-20 19:40:17 -05:00
Rene Rivera	d1fa581326	Bump B2 require to 5.2	2024-06-14 11:33:55 -05:00
Rene Rivera	19d484e707	Add requires-b2 check to top-level build file.	2024-05-05 09:00:01 -05:00
Rene Rivera	a50009a44f	Sync from upstream.	2024-04-20 15:34:26 -05:00
Rene Rivera	7958b78d45	Make the library modular usable.	2024-03-11 08:38:17 -05:00