Update docker.md

Update setup-cpp to v0.36.2

Upgrade to gcovr v6.0

Use newest cmake and project_options

Author: ClausKlein

.devcontainer/Dockerfile

@@ -5,7 +5,7 @@ RUN apt-get update -qq && \
     # install nodejs
     apt-get install -y --no-install-recommends nodejs npm && \
     # install setup-cpp
-    npm install -g setup-cpp@v0.35.1 && \
+    npm install -g setup-cpp@v0.36.2 && \
     # install the compiler and tools
     setup-cpp \
         --nala true \
@@ -28,4 +28,8 @@ RUN apt-get update -qq && \
     rm -rf /var/lib/apt/lists/* && \
     rm -rf /tmp/*
 
+# Include project
+ADD . /workspaces/cpp_vcpkg_project
+WORKDIR /workspaces/cpp_vcpkg_project
+
 ENTRYPOINT ["/bin/bash"]

.devcontainer/run.sh

@@ -30,7 +30,7 @@ jobs:
       matrix:
         os:
           - ubuntu-22.04
-          - macos-11
+          - macos-13
           - windows-2022
         compiler:
           # you can specify the version after `-` like "llvm-13.0.0".
@@ -51,9 +51,9 @@ jobs:
 
           # Only to test non-multiconfig builds
           - os: ubuntu-22.04
-            compiler: gcc-11
-            CMAKE_GENERATOR: "Unix Makefiles"
-            GCOV: gcov-11
+            compiler: gcc
+            CMAKE_GENERATOR: "Ninja"
+            GCOV: gcov
 
           - os: windows-2022
             compiler: msvc
@@ -95,10 +95,8 @@ jobs:
           ccache: true
           clangtidy: true
           task: true
-
           cppcheck: true
-
-          gcovr: "5.2"
+          gcovr: true
           opencppcoverage: true
 
       - name: Initialize CodeQL

.github/workflows/ci.yml

@@ -13,9 +13,9 @@ stages:
   echo -e "\e[0Ksection_start:`date +%s`:my_setup_linux[collapsed=true]\r\e[0KHeader of the setup linux collapsible section"
   DEBIAN_FRONTEND=noninteractive
 
-  # XXX WHY? set time-zone
-  # TZ=Canada/Pacific
-  # ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+  # set time-zone
+  TZ=Canada/Pacific
+  ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
   # for downloading
   apt-get update -qq
@@ -24,8 +24,9 @@ stages:
 
 .setup_cpp: &setup_cpp |
   echo -e "\e[0Ksection_start:`date +%s`:my_setup_cpp[collapsed=true]\r\e[0KHeader of the setup cpp collapsible section"
-  curl -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.33.0/setup-cpp-x64-linux"
+  curl -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.35.3/setup-cpp-x64-linux"
   chmod +x setup-cpp-x64-linux
+  # export PATH="$HOME/.local/bin:$PATH"
   ./setup-cpp-x64-linux --compiler $compiler --ccache true --vcpkg true --clangtidy true
   source ~/.cpprc
   pwd && mkdir -p build/coverage
@@ -35,6 +36,7 @@ stages:
   python3 -m pip install cmake ninja gcovr
   cmake --version
   ninja --version
+  which gcovr && gcovr --version
 
 # XXX not longer used! CK
 .task: &test |
@@ -52,7 +54,7 @@ stages:
     - echo -e "\e[0Ksection_end:`date +%s`:my_build\r\e[0K"
 
 default:               # Add a default section to define the `image` keyword's default value
-  image: ubuntu:22.04
+  image: ubuntu:latest
   before_script:
     - *setup_linux
 

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.21...3.27)
+cmake_minimum_required(VERSION 3.21...3.28)
 
 # set a default CXX standard for the tools and targets that do not specify them.
 # If commented, the latest supported standard for your compiler is automatically set.
@@ -14,7 +14,7 @@ endif()
 
 # Add project_options from https://github.com/aminya/project_options
 # Change the version in the following URL to update the package (watch the releases of the repository for future updates)
-set(PROJECT_OPTIONS_VERSION "v0.33.1")
+set(PROJECT_OPTIONS_VERSION "v0.34.0")
 FetchContent_Declare(
   _project_options
   GIT_SUBMODULES ""

CMakeLists.txt

@@ -5,9 +5,6 @@
         "minor": 25,
         "patch": 0
     },
-    "include": [
-        "CMakeWorkflowPresets.json"
-    ],
     "configurePresets": [
         {
             "name": "conf-common",

CMakePresets.json

@@ -4,10 +4,9 @@
 # - list all the task under PHONY
 # - If getting missing separator error, try replacing spaces with tabs.
 # - If using Visual Studio, either run the following commands inside the Visual Studio command prompt (vcvarsall) or remove the Ninja generator from the commands.
-.PHONY: build test test_release docs format clean
+.PHONY: build test test_release test_install docs format clean
 
-build:
-	make release
+build: release
 
 release:
 	cmake -S ./ -B ./build -G "Ninja Multi-Config" -DCMAKE_BUILD_TYPE:STRING=Release -DFEATURE_TESTS:BOOL=OFF
@@ -41,15 +40,15 @@ test_release:
 	(cd build/my_header_lib/test && ctest -C Release --output-on-failure)
 	(cd build/my_lib/test && ctest -C Release --output-on-failure)
 
-test_install:
-	cmake --install ./build --prefix ./build/test_install
+test_install: release
+	cmake --install ./build --prefix ./build/install
 
 coverage:
 ifeq ($(OS), Windows_NT)
 	OpenCppCoverage.exe --export_type cobertura:coverage.xml --cover_children -- make test
 else
 	make test
-	gcovr -j 1 --delete --root ./ --print-summary --xml-pretty --xml coverage.xml ./build --gcov-executable gcov
+	gcovr -j 1 --delete --root ./ --print-summary --xml-pretty --xml coverage.xml ./build --gcov-executable gcov-13
 endif
 
 docs:
@@ -68,4 +67,4 @@ ifeq ($(OS), Windows_NT)
 	pwsh -c 'function rmrf($$path) { if (test-path $$path) { rm -r -force $$path }}; rmrf ./build;'
 else
 	rm -rf ./build
-endif
+endif

Makefile

@@ -24,7 +24,7 @@ CMake will detect which compiler was used to build each of the Conan targets. If
 
 	- Temporarily (only for the current shell)
 
-		Run one of the followings in the terminal:
+		Run one of the following in the terminal:
 
 		- clang
 
@@ -51,7 +51,7 @@ CMake will detect which compiler was used to build each of the Conan targets. If
 
 	- Permanent:
 
-		Run one of the followings in PowerShell:
+		Run one of the following in PowerShell:
 
 		- Visual Studio generator and compiler (cl)
 
@@ -92,7 +92,7 @@ With Cmake directly:
 
     cmake -S . -B ./build
 
-Cmake will automatically create the `./build` folder if it does not exist, and it wil configure the project.
+Cmake will automatically create the `./build` folder if it does not exist, and it configures the project.
 
 Instead, if you have CMake version 3.21+, you can use one of the configuration presets that are listed in the CmakePresets.json file.
 

build/coverage/.keep

@@ -10,24 +10,9 @@ docker run -it devcontainer:latest
 
 This command will put you in a `bash` session in a Ubuntu 22.04 Docker container,
 with all of the tools listed in the [Dependencies](#dependencies) section already installed.
-Additionally, you will have `g++-13` and `clang++-13` installed as the default
+Additionally, you will have `g++-13` and `clang++-16` installed as the default
 versions of `g++` and `clang++`.
 
-If you want to build this container using some other versions of gcc and clang,
-you may do so with the `GCC_VER` and `LLVM_VER` arguments:
-
-```bash
-docker build --tag=myproject:latest --build-arg GCC_VER=10 --build-arg LLVM_VER=15 .
-```
-
-The CC and CXX environment variables are set to GCC version 13 by default.
-If you wish to use clang as your default CC and CXX environment variables, you
-may do so like this:
-
-```bash
-docker build --tag=devcontainer:latest --build-arg USE_CLANG=1 .
-```
-
 You will be logged in as root, so you will see the `#` symbol as your prompt.
 You will be in a directory that contains a copy of the `cpp_vcpkg_project`;
 any changes you make to your local copy will not be updated in the Docker image
@@ -46,11 +31,10 @@ You can configure and build [as directed above](#build) using these commands:
 
 ```bash
 /cpp_vcpkg_project# cmake --workflow --preset gcc-debug
-/cpp_vcpkg_project# mkdir -p build/coverage
 /cpp_vcpkg_project# gcovr
 ```
 
-You can configure and build using `clang-15`, without rebuilding the container,
+You can configure and build using `clang-16`, without rebuilding the container,
 with these commands:
 
 ```bash