Cleanup

.github/workflows/ci.yml

@@ -1,104 +1,108 @@
 name: CI
 
-on: [push, pull_request, release]
+on: [ pull_request ]
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
         config:
-        - {
-            name: linux-x64-clang-9,
-            os: ubuntu-18.04,
-            cxx: clang++-9,
-            cmake-build-type: Release
-          }
-        - {
-            name: macos-x64-gcc,
-            os:  macos-10.15,
-            cxx: g++,
-            cmake-build-type: Release
-          }
-        - {
-            name: macos-x64-clang,
-            os:  macos-10.15,
-            cxx: clang++,
-            cmake-build-type: Release
-          }
-        - {
-            name: linux-x64-clang-12-sanitize,
-            os: ubuntu-20.04,
-            cxx: clang++-12,
-            cxx-flags: "-fsanitize=address,undefined",
-            cmake-build-type: Release
-          }
-        - {
-            name: linux-x64-gcc-10-coverage,
-            os: ubuntu-20.04,
-            cxx: g++-10,
-            cxx-flags: --coverage,
-            gcov-tool: gcov-10,
-            cmake-build-type: Debug
-          }
-        - {
-          name: linux-x64-clang-11,
-          os: ubuntu-20.04,
-          cxx: clang++-11,
-          cmake-build-type: Release
-        }
-        - {
-          name: linux-x64-clang-12,
-          os: ubuntu-22.04,
-          cxx: clang++-12,
-          cmake-build-type: Release
-        }
-        - {
-          name: linux-x64-clang-13,
-          os: ubuntu-22.04,
-          cxx: clang++-13,
-          cmake-build-type: Release
-        }
-        - {
-          name: linux-x64-clang-14,
-          os: ubuntu-22.04,
-          cxx: clang++-14,
-          cmake-build-type: Release
-        }
-        - {
-          name: linux-x64-gcc-11,
-          os: ubuntu-22.04,
-          cxx: g++-11,
-          cmake-build-type: Release
-        }
-    name: ${{matrix.config.name}}
+        # These get queued but never actually run
+        #- name: macos-x64-gcc,
+        #  os:  macos-13.5,
+        #  cxx: g++,
+        #- name: macos-x64-clang,
+        #  os:  macos-13.5,
+        #  cxx: clang++,
+
+        - name: linux-x64-clang-14
+          os: ubuntu-22.04
+          cxx: clang++-14
+
+        - name: linux-x64-clang-15
+          os: ubuntu-22.04
+          cxx: clang++-15
+
+        - name: linux-x64-clang-16-sanitize
+          os: ubuntu-22.04
+          cxx: clang++-16
+          cxx-flags: -fsanitize=undefined -fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls
+
+        - name: linux-x64-gcc-11-coverage
+          os: ubuntu-22.04
+          cxx: g++-11
+          cxx-flags: --coverage
+          gcov-tool: gcov-11
+
+        - name: linux-x64-gcc-12
+          os: ubuntu-22.04
+          cxx: g++-12
+
+        - name: linux-x64-gcc-13
+          os: ubuntu-22.04
+          cxx: g++-13
+
     runs-on: ${{matrix.config.os}}
     steps:
-    - uses: actions/checkout@v2
-
-    # Linux or macOS
-    - name: Install boost (Linux or macOS)
-      run: vcpkg install boost-test boost-container boost-interprocess
-      if: runner.os == 'Linux' || runner.os == 'macOS'
-
-    - name: Configure CMake (Linux or macOS)
-      run: cmake -DCMAKE_BUILD_TYPE=${{matrix.config.cmake-build-type}} -DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -S ${{github.workspace}}/tests -B ${{github.workspace}}/build
-      env:
-        CXX: ${{matrix.config.cxx}}
-        CXXFLAGS: ${{matrix.config.cxx-flags}}
-      if: runner.os == 'Linux' || runner.os == 'macOS'
-
-    - name: Build (Linux or macOS)
-      run: cmake --build ${{github.workspace}}/build --verbose
-      if: runner.os == 'Linux' || runner.os == 'macOS'
-
-    - name: Test (Linux or macOS)
-      run: ${{github.workspace}}/build/tsl_sparse_map_tests
-      if: runner.os == 'Linux' || runner.os == 'macOS'
-
-    - name: Coverage
-      run: |
-        sudo apt-get install -y lcov
-        lcov -c -b ${{github.workspace}}/include -d ${{github.workspace}}/build -o ${{github.workspace}}/coverage.info --no-external --gcov-tool ${{matrix.config.gcov-tool}}
-        bash <(curl -s https://codecov.io/bash) -f ${{github.workspace}}/coverage.info
-      if: ${{matrix.config.name == 'linux-x64-gcc-10-coverage'}}
+      - name: Add Repos for for gcc-13 and clang-16
+        run: |
+          # gcc-13
+          sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+          
+          # clang-16
+          source /etc/os-release
+          echo "deb http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-16 main" | sudo tee /etc/apt/sources.list.d/llvm-16.list
+          curl https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/llvm-16.gpg > /dev/null
+          
+          sudo apt-get update -y
+        if: runner.os == 'Linux'
+
+      - name: Install compiler
+        id: install_cc
+        uses: rlalik/[email protected]
+        with:
+          compiler: ${{ matrix.config.cxx }}
+        if: runner.os == 'Linux'
+
+      - name: Check out sources
+        uses: actions/checkout@v3
+
+      - name: Install boost (Linux)
+        run: sudo apt-get install -y libboost-dev
+        if: runner.os == 'Linux'
+
+      - name: Install boost (macOS)
+        run: vcpkg install boost-interprocess
+        if: runner.os == 'macOS'
+
+      - name: Configure CMake (Linux)
+        run: cmake -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -B build
+        env:
+          CXX: ${{matrix.config.cxx}}
+          CXXFLAGS: ${{matrix.config.cxx-flags}}
+        if: runner.os == 'Linux'
+
+      - name: Configure CMake (macOS)
+        run: cmake -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -B build
+        env:
+          CXX: ${{matrix.config.cxx}}
+          CXXFLAGS: ${{matrix.config.cxx-flags}}
+        if: runner.os == 'macOS'
+
+      - name: Build
+        working-directory: build
+        run: cmake --build . --verbose --parallel 2
+        if: runner.os == 'Linux' || runner.os == 'macOS'
+
+      - name: Test
+        working-directory: build
+        run: ctest --parallel 2 --verbose
+        if: runner.os == 'Linux' || runner.os == 'macOS'
+
+      - name: Coverage
+        run: |
+          sudo apt-get install -y lcov
+          lcov -c -b ${{github.workspace}}/include -d ${{github.workspace}}/build -o ${{github.workspace}}/coverage.info --no-external --gcov-tool ${{matrix.config.gcov-tool}}
+          bash <(curl -s https://codecov.io/bash) -f ${{github.workspace}}/coverage.info
+        if: ${{matrix.config.name == 'linux-x64-gcc-11-coverage'}}

.gitignore

@@ -80,88 +80,26 @@ environment_run.sh.env
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# AWS User-specific
-.idea/**/aws.xml
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
+.idea/
 
 # CMake
 cmake-build-*/
 
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
 # File-based project format
 *.iws
 
 # IntelliJ
 out/
 
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
 # JIRA plugin
 atlassian-ide-plugin.xml
 
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# SonarLint plugin
-.idea/sonarlint/
-
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-### Intellij+all Patch ###
-# Ignore everything but code style settings and run configurations
-# that are supposed to be shared within teams.
-
-.idea/*
-
-!.idea/codeStyles
-!.idea/runConfigurations
 
 ### Ninja ###
 .ninja_deps

CMakeLists.txt

@@ -6,19 +6,13 @@ project(dice-sparse-map
 include(cmake/boilerplate_init.cmake)
 boilerplate_init()
 
-find_package(Boost REQUIRED)
-
 add_library(${PROJECT_NAME} INTERFACE)
 # Use dice::sparse_map as target, more consistent with other libraries conventions (Boost, Qt, ...)
 add_library("${PROJECT_NAME}::${PROJECT_NAME}" ALIAS "${PROJECT_NAME}")
 
 target_include_directories(${PROJECT_NAME}
         INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>")
 
-target_link_libraries(${PROJECT_NAME} INTERFACE
-        Boost::headers
-        )
-
 if(MSVC)
     target_sources(${PROJECT_NAME} INTERFACE
                    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tsl-sparse-map.natvis>"
@@ -30,4 +24,9 @@ if (IS_TOP_LEVEL)
     install_interface_library("${PROJECT_NAME}" "${PROJECT_NAME}" "${PROJECT_NAME}" "include")
 endif ()
 
-
+if (BUILD_TESTING AND IS_TOP_LEVEL)
+    message("Building testing")
+    include(CTest)
+    enable_testing()
+    add_subdirectory(tests)
+endif ()