From e8814eca8c7da57ca1feb7a3918dd25b040cbc32 Mon Sep 17 00:00:00 2001 From: Leonhard Reichenbach Date: Wed, 20 Mar 2024 14:38:52 +0100 Subject: [PATCH 1/2] Add install target --- .gitignore | 1 + CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 3d8f68b..bff82ca 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,5 @@ _deps *.root *.slcio build/* +install/* .vscode diff --git a/CMakeLists.txt b/CMakeLists.txt index 018cccc..7f148d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,5 +18,9 @@ limitations under the License. ]] project(CLDConfig) +include(GNUInstallDirs) + add_subdirectory(test) enable_testing() + +install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/CLDConfig/ DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}) From b45199155969bde5b413234468790dd271ac7291 Mon Sep 17 00:00:00 2001 From: Leonhard Reichenbach Date: Wed, 20 Mar 2024 14:52:14 +0100 Subject: [PATCH 2/2] remove old CI --- .github/workflows/test.yml | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 5604cf7..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: test - -on: [push, pull_request] - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - SETUP: ['/cvmfs/sw.hsf.org/key4hep/setup.sh', '/cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh'] - steps: - - uses: cvmfs-contrib/github-action-cvmfs@v3.1 - - - name: Checkout - uses: actions/checkout@v3 - - - name: Start container - run: | - docker run \ - -it --name CLDConfig_CI \ - -v ${{ github.workspace }}:/CLDConfig \ - -v /cvmfs:/cvmfs:shared \ - -d ghcr.io/aidasoft/centos7:latest /bin/bash - - - name: Run tests (pytest) - run: | - docker exec CLDConfig_CI /bin/bash -c 'source ${{ matrix.SETUP }}; - cd CLDConfig; - cmake .; - ctest --output-on-failure; - '