Update devcontainers and scripts

arBmind · arBmind · commit db0fae391d21 · 2024-06-02T03:00:14.000+02:00
diff --git a/.devcontainer/clang15/clang15.Dockerfile b/.devcontainer/clang15/clang15.Dockerfile
diff --git a/.devcontainer/clang17/clang17.Dockerfile b/.devcontainer/clang17/clang17.Dockerfile
@@ -0,0 +1,29 @@
+FROM mcr.microsoft.com/devcontainers/base:alpine-3.20
+
+RUN \
+  apk add --update --no-cache \
+    clang17 \
+    libc++-dev \
+    cmake \
+    ninja \
+    git \
+    gdb \
+    linux-headers \
+    py3-pip
+
+# install gdb c++ support
+RUN \
+  git clone --depth 1 https://github.com/koutheir/libcxx-pretty-printers.git /usr/share/libcxx-pretty-printers \
+  && echo "set print pretty on" > /home/vscode/.gdbinit \
+  && echo "set print object on" > /home/vscode/.gdbinit \
+  && echo "# See: https://github.com/koutheir/libcxx-pretty-printers" > /home/vscode/.gdbinit \
+  && echo "python" > /home/vscode/.gdbinit \
+  && echo "import sys" >>/home/vscode/.gdbinit \
+  && echo "sys.path.insert(0, '/usr/share/libcxx-pretty-printers/src')" >>/home/vscode/.gdbinit \
+  && echo "from libcxx.v1.printers import register_libcxx_printers" >>/home/vscode/.gdbinit \
+  && echo "register_libcxx_printers (None)" >>/home/vscode/.gdbinit \
+  && echo "end" >>/home/vscode/.gdbinit
+
+ENV \
+  CC=/usr/bin/clang \
+  CXX=/usr/bin/clang++
diff --git a/.devcontainer/clang17/devcontainer.json b/.devcontainer/clang17/devcontainer.json
@@ -0,0 +1,17 @@
+{
+	"name": "cocpp19-clang17",
+	"build": {
+		"dockerfile": "./clang17.Dockerfile",
+		"context": "."
+	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-vscode.cpptools",
+				"ms-vscode.cmake-tools",
+				"ms-python.python"
+			]
+		}
+	},
+	"remoteUser": "vscode"
+}
diff --git a/.devcontainer/clang18/clang18.Dockerfile b/.devcontainer/clang18/clang18.Dockerfile
@@ -0,0 +1,30 @@
+FROM mcr.microsoft.com/devcontainers/base:alpine-3.20
+
+RUN \
+  apk add --update --no-cache \
+    clang18 \
+    libc++-dev \
+    cmake \
+    ninja \
+    git \
+    gdb \
+    linux-headers \
+    py3-pip
+
+# install gdb c++ support
+RUN \
+  git clone --depth 1 https://github.com/koutheir/libcxx-pretty-printers.git /usr/share/libcxx-pretty-printers \
+  && echo "set print pretty on" > /home/vscode/.gdbinit \
+  && echo "set print object on" > /home/vscode/.gdbinit \
+  && echo "# See: https://github.com/koutheir/libcxx-pretty-printers" > /home/vscode/.gdbinit \
+  && echo "python" > /home/vscode/.gdbinit \
+  && echo "import sys" >>/home/vscode/.gdbinit \
+  && echo "sys.path.insert(0, '/usr/share/libcxx-pretty-printers/src')" >>/home/vscode/.gdbinit \
+  && echo "from libcxx.v1.printers import register_libcxx_printers" >>/home/vscode/.gdbinit \
+  && echo "register_libcxx_printers (None)" >>/home/vscode/.gdbinit \
+  && echo "end" >>/home/vscode/.gdbinit
+
+ENV \
+  PATH="/usr/lib/llvm18/bin:${PATH}" \
+  CC=/usr/bin/clang-18 \
+  CXX=/usr/bin/clang++-18
diff --git a/.devcontainer/clang18/devcontainer.json b/.devcontainer/clang18/devcontainer.json
@@ -0,0 +1,17 @@
+{
+	"name": "cocpp19-clang18",
+	"build": {
+		"dockerfile": "./clang18.Dockerfile",
+		"context": "."
+	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-vscode.cpptools",
+				"ms-vscode.cmake-tools",
+				"ms-python.python"
+			]
+		}
+	},
+	"remoteUser": "vscode"
+}
diff --git a/.devcontainer/gcc12/devcontainer.json b/.devcontainer/gcc12/devcontainer.json
@@ -1,5 +1,5 @@
 {
-	"name": "gcc12",
+	"name": "cocpp19-gcc12",
 	"build": {
 		"dockerfile": "./gcc12.Dockerfile",
 		"context": "."
diff --git a/.devcontainer/gcc12/gcc12.Dockerfile b/.devcontainer/gcc12/gcc12.Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/base:alpine-3.17
+FROM mcr.microsoft.com/devcontainers/base:alpine-3.18
 
 RUN \
   apk add --update --no-cache \
diff --git a/.devcontainer/gcc13/devcontainer.json b/.devcontainer/gcc13/devcontainer.json
@@ -1,14 +1,15 @@
 {
-	"name": "clang15",
+	"name": "cocpp19-gcc13",
 	"build": {
-		"dockerfile": "./clang15.Dockerfile",
+		"dockerfile": "./gcc13.Dockerfile",
 		"context": "."
 	},
 	"customizations": {
 		"vscode": {
 			"extensions": [
 				"ms-vscode.cpptools",
-				"ms-vscode.cmake-tools"
+				"ms-vscode.cmake-tools",
+				"ms-python.python"
 			]
 		}
 	},
diff --git a/.devcontainer/gcc13/gcc13.Dockerfile b/.devcontainer/gcc13/gcc13.Dockerfile
@@ -0,0 +1,11 @@
+FROM mcr.microsoft.com/devcontainers/base:alpine-3.20
+
+RUN \
+  apk add --update --no-cache \
+    build-base \
+    cmake \
+    ninja \
+    git \
+    gdb \
+    linux-headers \
+    py3-pip
diff --git a/.github/workflows/cmake_tests.yml b/.github/workflows/cmake_tests.yml
@@ -53,16 +53,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - image: "arbmind/cmake-clang:3.25.1-13"
-            preset: "clang"
           - image: "arbmind/cmake-clang:3.25.1-14"
             preset: "clang"
+          - image: "arbmind/cmake-clang:3.27.6-17"
+            preset: "clang"
           - image: "arbmind/cmake-clang-libstdcpp:3.25.1-15-12"
             preset: "clang-libstdcpp"
           - image: "arbmind/cmake-gcc:3.25.1-11"
             preset: "gcc"
           - image: "arbmind/cmake-gcc:3.25.1-12"
             preset: "gcc"
+          - image: "arbmind/cmake-gcc:3.27.6-13"
+            preset: "gcc"
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/qbs_tests.yml b/.github/workflows/qbs_tests.yml
@@ -11,13 +11,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - image: arbmind/qbs-clang:1.21.0-13
-            build_args: "modules.cpp.cxxStandardLibrary:libc++ modules.cpp.staticLibraries:c++,c++abi"
           - image: arbmind/qbs-clang:1.21.0-14
             build_args: "modules.cpp.cxxStandardLibrary:libc++ modules.cpp.staticLibraries:c++,c++abi"
+          - image: arbmind/qbs-clang:2.1.2-17
+            build_args: "modules.cpp.cxxStandardLibrary:libc++ modules.cpp.staticLibraries:c++,c++abi"
           - image: arbmind/qbs-clang-libstdcpp:1.24.0-15-12
           - image: arbmind/qbs-gcc:1.21.0-11
           - image: arbmind/qbs-gcc:1.24.0-12
+          - image: arbmind/qbs-gcc:2.1.2-13
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/static_analyse.yml b/.github/workflows/static_analyse.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - image: arbmind/cmake-clang:3.25.1-15
+          - image: arbmind/cmake-clang:3.27.6-17
             preset: clang-analyze
 
     steps:
diff --git a/script/create_conan.sh b/script/create_conan.sh
@@ -10,4 +10,4 @@ cd "$(dirname "${BASH_SOURCE[0]}")/.."
 BASE_DIR="$(pwd)"
 
 cd conan
-conan create . --build=missing --profile "profiles/${ConanProfile}"
+conan create . --build=missing --profile "conan/profiles/${ConanProfile}"
diff --git a/script/docker_run_cmake_clang.sh b/script/docker_run_cmake_clang.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+PROJECT="co-cpp19"
+IMAGE="arbmind/cmake-clang:latest"
+BUILD_VOLUME="${PROJECT}-cmake-build"
+
+cd "$(dirname "$0")/.."
+docker run -it --rm --mount "src=$(pwd),target=/project,type=bind" -w /project --mount "src=${BUILD_VOLUME},target=/project/build,type=volume" "${IMAGE}" "%@"
diff --git a/script/docker_run_cmake_gcc.sh b/script/docker_run_cmake_gcc.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+PROJECT="co-cpp19"
+IMAGE="arbmind/cmake-gcc:latest"
+BUILD_VOLUME="${PROJECT}-cmake-build"
+
+cd "$(dirname "$0")/.."
+docker run -it --rm --mount "src=$(pwd),target=/project,type=bind" -w /project --mount "src=${BUILD_VOLUME},target=/project/build,type=volume" "${IMAGE}" "$@"
diff --git a/script/docker_run_cmake_gcc_conan.sh b/script/docker_run_cmake_gcc_conan.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+PROJECT="co-cpp19"
+IMAGE="conanio/gcc12-ubuntu18.04:latest"
+BUILD_VOLUME="${PROJECT}-conan-build"
+
+cd "$(dirname "$0")/.."
+docker run -it --rm --mount "src=$(pwd),target=/project,type=bind" -w /project --mount "src=${BUILD_VOLUME},target=/project/build,type=volume" "${IMAGE}" "$@"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "gcc12",`
	`2`	`+ "name": "cocpp19-gcc12",`
`3`	`3`	`"build": {`
`4`	`4`	`"dockerfile": "./gcc12.Dockerfile",`
`5`	`5`	`"context": "."`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM mcr.microsoft.com/devcontainers/base:alpine-3.17`
	`1`	`+FROM mcr.microsoft.com/devcontainers/base:alpine-3.18`
`2`	`2`
`3`	`3`	`RUN \`
`4`	`4`	`apk add --update --no-cache \`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,15 @@`
`1`	`1`	`{`
`2`		`- "name": "clang15",`
	`2`	`+ "name": "cocpp19-gcc13",`
`3`	`3`	`"build": {`
`4`		`- "dockerfile": "./clang15.Dockerfile",`
	`4`	`+ "dockerfile": "./gcc13.Dockerfile",`
`5`	`5`	`"context": "."`
`6`	`6`	`},`
`7`	`7`	`"customizations": {`
`8`	`8`	`"vscode": {`
`9`	`9`	`"extensions": [`
`10`	`10`	`"ms-vscode.cpptools",`
`11`		`- "ms-vscode.cmake-tools"`
	`11`	`+ "ms-vscode.cmake-tools",`
	`12`	`+ "ms-python.python"`
`12`	`13`	`]`
`13`	`14`	`}`
`14`	`15`	`},`