Test with linux clang-23, and gcc-16 in docker

.github/workflows/ci_tests.yml

@@ -9,14 +9,18 @@ on:
   pull_request:
   workflow_dispatch:
   schedule:
-    - cron: '30 15 * * *'
+    - cron: '30 15 * * 6'
+
+concurrency:
+  group: ${{format('{0}:{1}', github.repository, github.ref)}}
+  cancel-in-progress: true
 
 jobs:
   beman-submodule-check:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.3.0
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.3
 
   preset-test:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.3.0
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.3
     with:
       matrix_config: >
         [
@@ -29,12 +33,12 @@ jobs:
         ]
 
   build-and-test:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.3.0
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.3
     with:
       matrix_config: >
         {
           "gcc": [
-            { "versions": ["15"],
+            { "versions": ["16"],
               "tests": [
                 { "cxxversions": ["c++26"],
                   "tests": [
@@ -52,7 +56,7 @@ jobs:
                 }
               ]
             },
-            { "versions": ["14"],
+            { "versions": ["15"],
               "tests": [
                 { "cxxversions": ["c++26", "c++23"],
                   "tests": [{ "stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
@@ -110,4 +114,4 @@ jobs:
   create-issue-when-fault:
     needs: [preset-test, build-and-test]
     if: failure() && github.event_name == 'schedule'
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.3.0
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.3

.github/workflows/pre-commit-update.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   auto-update-pre-commit:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.3.0
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.7.3
     secrets:
       APP_ID: ${{ secrets.AUTO_PR_BOT_APP_ID }}
       PRIVATE_KEY: ${{ secrets.AUTO_PR_BOT_PRIVATE_KEY }}

.gitignore

@@ -41,6 +41,7 @@ cmake-build-*
 .cache
 .vscode
 .idea
+.init
 compile_commands.json
 stagedir
 

CMakePresets.json

@@ -90,7 +90,7 @@
         "_release-base"
       ],
       "cacheVariables": {
-        "BEMAN_USE_STD_MODULE": false,
+        "BEMAN_USE_STD_MODULE": true,
         "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/llvm-libc++-toolchain.cmake"
       },
       "environment": {

GNUmakefile

@@ -0,0 +1,46 @@
+# GNUmakefile
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+MAKEFLAGS+= --no-builtin-rules          # Disable the built-in implicit rules.
+MAKEFLAGS+= --warn-undefined-variables  # Warn when an undefined variable is referenced.
+.SUFFIXES:                              # Disable all suffix rules.
+##################################################
+
+PRESET ?= release
+IMAGE ?= linux-clang:23
+
+.PHONY: all check distclean dockerbuild
+
+# default target rule
+all: .init compile_commands.json
+	cmake --workflow --preset $(PRESET)
+
+.init: CMakeUserPresets.json CMakePresets.json CMakeLists.txt #NO! $(MAKEFILE)
+	cmake --preset $(PRESET) --fresh --log-level=VERBOSE
+	touch $@
+
+check: .init compile_commands.json
+compile_commands.json: build/$(PRESET)/compile_commands.json
+	ln -fs $< $@
+
+CMakeUserPresets.json:: cmake/CMakeUserPresets.json
+	ln -fs $< $@
+
+distclean:
+	rm -rf build .cache
+	rm -f CMakeUserPresets.json \
+	compile_commands.json \
+	.init
+	find . -name '*~' -delete
+
+dockerbuild:
+	docker run -it -v $(CURDIR):/home/builder/workdir $(IMAGE)
+
+# NOTE: double-colon targets which has no prerequisites must always remade by gmake?
+#  Prerequisite 'GNUmakefile' is newer than target '.init'.
+#  -> Must remake target '.init'.
+# NOTE: impizit handled by gmake! GNUmakefile :: ;
+
+# Anything we don't know how to build will use this rule.
+% ::
+	ninja -C build/$(PRESET) $(@)

Makefile

@@ -53,7 +53,7 @@ ifeq (${hostSystemName},Darwin)
   # export LDFLAGS=-L$(LLVM_DIR)/lib/c++ -lc++abi -lc++ # -lc++experimental
   # export GCOV="llvm-cov gcov"
 
-  ### TODO: to test g++-15:
+  ### TODO: to test g++-16:
   # export GCC_PREFIX:=$(shell brew --prefix gcc)
   # export GCC_DIR:=$(shell realpath ${GCC_PREFIX})
 
@@ -63,16 +63,16 @@ ifeq (${hostSystemName},Darwin)
         export CXX=clang++
         CXXLIB=libc++
     else
-        export CXX=g++-15
+        export CXX=g++-16
         CXXLIB=libstdc++
     endif
     export CXX_FLAGS=-stdlib=$(CXXLIB)
   endif
   export GCOV="gcov"
 else ifeq (${hostSystemName},Linux)
-  export LLVM_DIR=/usr/lib/llvm-20
+  export LLVM_DIR=/usr/lib/llvm-23
   export PATH:=${LLVM_DIR}/bin:${PATH}
-  # export CXX=clang++-20
+  # NO! export CXX=clang++-23
 else
   export CXX=$(COMPILER)
 endif

cmake/prelude.cmake

@@ -21,7 +21,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 # ---------------------------------------------------------------------------
 # The CMAKE_EXPERIMENTAL_CXX_IMPORT_STD is not longer needed except for OSX
 # ---------------------------------------------------------------------------
-if(NOT BEMAN_USE_STD_MODULE OR CMAKE_VERSION VERSION_GREATER_EQUAL 4.4)
+if(NOT BEMAN_USE_STD_MODULE OR CMAKE_VERSION VERSION_GREATER_EQUAL 4.5)
     if(NOT APPLE)
         return()
     endif()
@@ -46,7 +46,7 @@ include(
 )
 
 if(NOT APPLE)
-    return()
+    # return()
 endif()
 
 # ---------------------------------------------------------------------------
@@ -83,8 +83,6 @@ if(
         add_link_options(-L${LLVM_DIR}/lib/c++)
         include_directories(SYSTEM ${LLVM_DIR}/include)
 
-        # /usr/local/Cellar/llvm/21.1.8_1/lib/c++/libc++.modules.json
-        # "/usr/local/Cellar/llvm/21.1.8_1/share/libc++/v1/std.cppm",
         set(CMAKE_CXX_STDLIB_MODULES_JSON
             ${LLVM_DIR}/lib/c++/libc++.modules.json
         )
@@ -105,18 +103,19 @@ if(
     endif()
 
     if(EXISTS ${CMAKE_CXX_STDLIB_MODULES_JSON})
-        message(
-            STATUS
-            "CMAKE_CXX_STDLIB_MODULES_JSON=${CMAKE_CXX_STDLIB_MODULES_JSON}"
-        )
+        file(REAL_PATH "${CMAKE_CXX_STDLIB_MODULES_JSON}" LLVM_MODULES)
+        message(STATUS "CMAKE_CXX_STDLIB_MODULES_JSON=${LLVM_MODULES}")
         # gersemi: off
         set(CACHE{CMAKE_CXX_STDLIB_MODULES_JSON}
             TYPE FILEPATH
-            HELP "Result of: clang++ -print-file-name=c++/libc++.modules.json"
-            VALUE ${CMAKE_CXX_STDLIB_MODULES_JSON}
+            HELP "Result of: clang++ -print-file-name=libc++.modules.json"
+            VALUE ${LLVM_MODULES}
         )
         # gersemi: on
     else()
-        message(STATUS "File does NOT EXISTS! ${CMAKE_CXX_STDLIB_MODULES_JSON}")
+        message(
+            WARNING
+            "File does NOT EXISTS! ${CMAKE_CXX_STDLIB_MODULES_JSON}"
+        )
     endif()
 endif()

infra/.beman_submodule

@@ -1,3 +1,3 @@
 [beman_submodule]
 remote=https://github.com/bemanproject/infra.git
-commit_hash=7b66b858d7f48428fca936184aef2bd246ccc81a
+commit_hash=7fc85e2e26cb491926ca2744c359c2aa7ea8fd27

infra/cmake/enable-experimental-import-std.cmake

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.3.0")
+if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.4.0")
+    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
+        "f35a9ac6-8463-4d38-8eec-5d6008153e7d"
+    )
+elseif(CMAKE_VERSION VERSION_GREATER_EQUAL "4.3.0")
     set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
         "451f2fe2-a8a2-47c3-bc32-94786d8fc91b"
     )

tests/beman/execution/CMakeLists.txt

@@ -135,7 +135,7 @@ foreach(test ${execution_tests})
 endforeach()
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    return()
+    # TODO(CK): return()
 endif()
 
 #======================================================================