try to CI fix build (2)

basicpp17 · Oct 30, 2023 · c13e5f0 · c13e5f0
1 parent dafc7db
commit c13e5f0
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 9 deletions.
diff --git a/.devcontainer/clang15/clang15.Dockerfile b/.devcontainer/clang15/clang15.Dockerfile
@@ -3,6 +3,7 @@ FROM mcr.microsoft.com/devcontainers/base:alpine-3.17
 RUN \
   apk add --update --no-cache \
     clang15 \
+    libc++-dev \
     cmake \
     ninja \
     git \
@@ -11,6 +12,19 @@ RUN \
     py3-pip \
   && pip install conan
 
+# 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/clang16/clang16.Dockerfile b/.devcontainer/clang16/clang16.Dockerfile
@@ -0,0 +1,30 @@
+FROM mcr.microsoft.com/devcontainers/base:alpine-3.18
+
+RUN \
+  apk add --update --no-cache \
+    clang16 \
+    libc++-dev \
+    cmake \
+    ninja \
+    git \
+    gdb \
+    linux-headers \
+    py3-pip \
+  && pip install conan
+
+# 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/clang16/devcontainer.json b/.devcontainer/clang16/devcontainer.json
@@ -0,0 +1,16 @@
+{
+	"name": "clang16",
+	"build": {
+		"dockerfile": "./clang16.Dockerfile",
+		"context": "."
+	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-vscode.cpptools",
+				"ms-vscode.cmake-tools"
+			]
+		}
+	},
+	"remoteUser": "vscode"
+}
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/src/coro19.lib/coro19/coro19.qbs b/src/coro19.lib/coro19/coro19.qbs
@@ -8,11 +8,11 @@ StaticLibrary {
         cpp.cxxFlags: base.concat("/await") // enable coroutine-ts
     }
     Properties {
-        condition: qbs.toolchain.contains('msvc') && qbs.toolchain.contains('clang-cl')
+        condition: qbs.toolchain.contains('msvc') && qbs.toolchain.contains('clang-cl') && cpp.compilerVersionMajor < 11
         cpp.cxxFlags: base.concat("-Xclang", "-fcoroutines-ts") // enable coroutine-ts
     }
     Properties {
-        condition: qbs.toolchain.contains('clang')
+        condition: qbs.toolchain.contains('clang') && cpp.compilerVersionMajor < 11
         cpp.cxxFlags: base.concat("-fcoroutines-ts") // enable coroutine-ts
     }
 
@@ -33,7 +33,7 @@ StaticLibrary {
             cpp.cxxFlags: base.concat("/await") // enable coroutine-ts
         }
         Properties {
-            condition: qbs.toolchain.contains('msvc') && qbs.toolchain.contains('clang-cl')
+            condition: qbs.toolchain.contains('msvc') && qbs.toolchain.contains('clang-cl') && cpp.compilerVersionMajor < 11
             cpp.cxxFlags: base.concat("-Xclang", "-fcoroutines-ts") // enable coroutine-ts
         }
         Properties {

diff --git a/src/enum19.lib/enum19/Enum.ostream.h b/src/enum19.lib/enum19/Enum.ostream.h
@@ -3,6 +3,7 @@
 
 #include <ostream>
 #include <string19/StringView.ostream.h>
+#include <stdint.h> // int64_t, uint64_t
 
 namespace enum19 {