Merge pull request #1 from hyperk/feature/hkpilot

Feature/hkpilot

Author: guiguem

.github/workflows/pullrequest_workflow.yml

@@ -0,0 +1,55 @@
+name: Build on push
+
+on: [pull_request]
+
+
+
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - uses: webfactory/[email protected]
+        with:
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        uses: docker/[email protected]
+        with:
+          context: .
+          file: Dockerfile
+          push: false
+          pull: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          ssh: |
+            default=${{ env.SSH_AUTH_SOCK }}
+
+#      - name: Build the Docker image
+#        run: docker build . --file Dockerfile --tag ghcr.io/hyperk/geant4:latest

.github/workflows/push_workflow.yml

@@ -0,0 +1,53 @@
+name: Build on push
+
+on:
+  push:
+    branches: [main]
+    tags: ['*']
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+
+
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - uses: webfactory/[email protected]
+        with:
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        uses: docker/[email protected]
+        with:
+          context: .
+          file: Dockerfile
+          push: true
+          pull: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          ssh: |
+            default=${{ env.SSH_AUTH_SOCK }}

.gitignore

@@ -1,4 +1,10 @@
 *~
 *.o
 *#
-*.so
+*.so
+.gitignore
+
+build/
+build-*
+install-*
+__pycache__

CMakeLists.txt

@@ -0,0 +1,19 @@
+# Minimum cmake verison 3.1 required for the variable CMAKE_CXX_STANDARD
+cmake_minimum_required(VERSION 3.1)
+
+
+set(PROJECT_NAME hk-DataModel)
+
+list(APPEND CMAKE_MODULE_PATH
+        $ENV{HK_PILOT_DIR}/cmake
+        )
+include(GetVersionGit)
+MESSAGE("Preparing project ${PROJECT_NAME} version ${PROJECT_VERSION}" )
+project(${PROJECT_NAME} VERSION ${PROJECT_VERSION})
+include(HKPackageBuilder)
+hkbuilder_prepare_project()
+set( PUBLIC_EXT_LIBS )
+hk_check_dependencies()
+
+
+add_subdirectory(DataModel)

DataModel/CMakeLists.txt

@@ -0,0 +1,25 @@
+
+include_directories(BEFORE
+        ${PROJECT_SOURCE_DIR}/DataModel
+    )
+
+# Don't include Utilities
+#file(GLOB_RECURSE SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp")
+#file(GLOB_RECURSE HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
+
+set (SRC 
+        DataModel.cpp
+        Utilities.cpp)
+set (HEADERS 
+        DataModel.h
+        Utilities.h)
+
+pbuilder_library(
+        TARGET DataModel
+        SOURCES ${SRC}
+        PROJECT_LIBRARIES ToolFrameworkCore::ToolFrameworkCore
+        PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
+)
+
+pbuilder_install_headers(${HEADERS})

DataModel.cpp DataModel/DataModel.cpp

@@ -0,0 +1,9 @@
+FROM ghcr.io/hyperk/hk-meta-externals:latest
+
+COPY . /usr/local/hk/hk-DataModel
+
+RUN --mount=type=ssh mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
+
+WORKDIR /usr/local/hk
+RUN --mount=type=ssh . /usr/local/hk/hk-pilot/setup.sh &&\
+    hkp install -r hk-DataModel

DataModel.h DataModel/DataModel.h

@@ -2,7 +2,7 @@ ToolFrameworkPath:= /usr/local/hk/ToolFrameworkCore/src
 
 CXXFLAGS:= g++ -O3 -fPIC
 
-objects:=$(patsubst %.cpp, %.o, $(wildcard *.cpp))
+objects:=$(patsubst %.cpp, %.o, $(wildcard DataModel/*.cpp))
 
 all: $(objects)
 	$(CXXFLAGS) --shared  $(objects) -o libDataModel.so

Utilities.cpp DataModel/Utilities.cpp

@@ -1 +1 @@
-# hk-Formats
+# hk-DataModel

Utilities.h DataModel/Utilities.h

@@ -0,0 +1 @@
+hk_package(ToolFrameworkCore*)

Dockerfile

@@ -0,0 +1,5 @@
+#${ PROJECT_NAME } Config.cmake
+
+get_filename_component($ { PROJECT_NAME } _CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+    include("${${PROJECT_NAME}_CMAKE_DIR}/${PROJECT_NAME}_Library_Targets.cmake")

Makefile

@@ -0,0 +1,8 @@
+from hkpilot.utils.cmake import CMake
+
+
+class hkDataModel(CMake):
+
+    def __init__(self, path):
+        super().__init__(path)
+        self._package_name = "hk-DataModel"