Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

version 1.4.0 #105

Merged
merged 1 commit into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 0 additions & 68 deletions .clang-format

This file was deleted.

32 changes: 32 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Build Dockerfile
on: push

jobs:
build_dockerfile:
runs-on: ubuntu-latest
steps:
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
- uses: actions/checkout@v4

- name: Build Dockerfile
uses: docker/build-push-action@v6
with:
context: .
load: true
tags: "tentris:${{ github.sha }}"
cache-from: type=gha
cache-to: type=gha,mode=max

- uses: shrink/actions-docker-extract@v3
id: extract
name: Extracting executables from docker image
with:
image: "tentris:${{ github.sha }}"
path: /.

- uses: actions/upload-artifact@v4
name: Uploading executables as artifacts
with:
name: tentris-frontend
path: ${{ steps.extract.outputs.destination }}/tentris_*
134 changes: 11 additions & 123 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
# log files
tentris.log

# Created by https://www.toptal.com/developers/gitignore/api/c++,conan,jetbrains+all,cmake
# Edit at https://www.toptal.com/developers/gitignore?templates=c++,conan,jetbrains+all,cmake
.clang-format
.clang-tidy

### C++ ###
# Prerequisites
*.d

Expand All @@ -21,12 +20,6 @@ tentris.log
*.gch
*.pch

# Linker files
*.ilk

# Debugger Files
*.pdb

# Compiled Dynamic libraries
*.so
*.dylib
Expand All @@ -47,121 +40,16 @@ tentris.log
*.out
*.app

### CMake ###
CMakeLists.txt.user
CMakeCache.txt
CMakeFiles
CMakeScripts
Testing
Makefile
cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
_deps
CMakeUserPresets.json

### CMake Patch ###
# External projects
*-prefix/

### Conan ###
# Conan build information
conan.lock
conanbuildinfo.*
conaninfo.txt
graph_info.json

### JetBrains+all ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# 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

# 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

# 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

# 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

### JetBrains+all Patch ###
# Ignores the whole .idea folder and all .iml files
# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
# project folders
cmake-build*/

# intellij
.idea/
venv/
/build/

# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023

*.iml
modules.xml
.idea/misc.xml
*.ipr

# Sonarlint plugin
.idea/sonarlint

# End of https://www.toptal.com/developers/gitignore/api/c++,conan,jetbrains+all,cmake

# docu folder
/docu/
test_package/build/
test_package/CMakeUserPresets.json
/CMakeUserPresets.json
/conan_provider.cmake
34 changes: 22 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,33 @@
cmake_minimum_required(VERSION 3.18)
project(tentris
VERSION 1.3.1
DESCRIPTION "tensor-based triplestore")
cmake_minimum_required(VERSION 3.24)
project(tentris VERSION 1.4.0
DESCRIPTION "Tentris - A tensor-based Triplestore.")

include(cmake/boilerplate_init.cmake)
boilerplate_init()

option(CONAN_CMAKE "If this should use conan cmake to fetch dependencies" On)
if (IS_TOP_LEVEL AND CONAN_CMAKE)
include(cmake/conan_cmake.cmake)
install_packages_via_conan("${CMAKE_CURRENT_SOURCE_DIR}/conanfile.py" "")
endif ()
if (PROJECT_IS_TOP_LEVEL)
set(CONAN_INSTALL_ARGS "${CONAN_INSTALL_ARGS};-o=boost/*:header_only=True")

if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/CMakeCache.txt)
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
if (BUILD_TESTING)
set(CONAN_INSTALL_ARGS "${CONAN_INSTALL_ARGS};-o=&:with_test_deps=True")
endif ()
endif ()

set(style_files
.clang-format
.clang-tidy
)
foreach(style_file ${style_files})
file(DOWNLOAD "https://raw.githubusercontent.com/dice-group/tentris-cpp-coding-guidelines/main/${style_file}"
"${CMAKE_SOURCE_DIR}/${style_file}"
TLS_VERIFY ON)
endforeach()

if (PROJECT_IS_TOP_LEVEL AND USE_CLANG_TIDY)
include(cmake/ClangTidy.cmake)
endif ()

add_compile_definitions(Dnsel_CONFIG_SELECT_EXPECTED=nsel_EXPECTED_NONSTD)

add_subdirectory(libs)
add_subdirectory(execs)
Loading
Loading