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

Install the examples to the correct place for key4hep-stack installations #100

Merged
merged 5 commits into from
Dec 19, 2022
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
6 changes: 3 additions & 3 deletions .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ on: [push, pull_request]

jobs:
clang-format:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: cvmfs-contrib/github-action-cvmfs@v2
- uses: actions/checkout@v3
- uses: cvmfs-contrib/github-action-cvmfs@v3
- name: Start container
run: |
docker run \
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/doctest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ jobs:
fail-fast: false
matrix:
SETUP: ['/cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh']
PAGE: ['doc/starterkit/k4MarlinWrapperCLIC/Readme', ]
PAGE: ['doc/starterkit/k4MarlinWrapperCLIC/Readme',
'doc/starterkit/k4MarlinWrapperCLIC/CEDViaWrapper']
steps:
- uses: actions/checkout@v2
- uses: cvmfs-contrib/github-action-cvmfs@v2
- uses: actions/checkout@v3
- uses: cvmfs-contrib/github-action-cvmfs@v3
- name: Start container
run: |
docker run -it --name CI_container -v ${GITHUB_WORKSPACE}:/Package -v /cvmfs:/cvmfs:shared -d ghcr.io/aidasoft/centos7:latest /bin/bash
Expand All @@ -21,14 +22,16 @@ jobs:
docker exec CI_container /bin/bash -c ' cd Package;/
source ${{ matrix.SETUP }};\
mkdir build; cd build;\
cmake .. ;\
make -j 2;\
cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=../install;\
ninja install;\
'
- name: CheckPage
run: |
docker exec CI_container /bin/bash -c 'cd ./Package;
source ${{ matrix.SETUP }};
source build/k4marlinwrapperenv.sh;
export LD_LIBRARY_PATH=/Package/install/lib64:$LD_LIBRARY_PATH
export PYTHONPATH=/Package/install/python:$PYTHONPATH
export K4MARLINWRAPPER=/Package/install/share/k4MarlinWrapper
mkdir testdir;
cat .github/scripts/yamlheader.md ${{ matrix.PAGE }}.md > testdir/test.md;
cd testdir;
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-18.04
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: actions/checkout@v2
- uses: cvmfs-contrib/github-action-cvmfs@v2
- uses: actions/checkout@v3
- uses: cvmfs-contrib/github-action-cvmfs@v3
- name: Start container
run: |
docker run \
Expand Down
2 changes: 1 addition & 1 deletion doc/starterkit/k4MarlinWrapperCLIC/CEDViaWrapper.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ All the following steps assume that the environment is setup like above and that

To create an input file for the event display we run a simple detector simulation using `ddsim` and a particle gun that shoots photons. The input file that we create here for illustration purposes has only 10 events, which also means that the creation should only take a few minutes. The steps to create this file are the following

```
```bash
ddsim --steeringFile CLICPerformance/clicConfig/clic_steer.py \
--compactFile $LCGEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
--enableGun \
Expand Down
2 changes: 1 addition & 1 deletion k4MarlinWrapper/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@ add_custom_command(
${CMAKE_CURRENT_BINARY_DIR}/genConfDir/k4MarlinWrapper/parseConstants.py)

# Install the example options files to share to make them easily accessible
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/examples DESTINATION share)
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/examples DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME})