Skip to content

Commit a1fc317

Browse files
committed
CI: test rayx with METRIX beamline; test with valgrind on linux
also install dependencies separately also run rayx in verbose mode
1 parent 93d3ebf commit a1fc317

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

.github/workflows/testUbuntu.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ jobs:
3232
run: |
3333
wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/lunarg.gpg
3434
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.296-noble.list https://packages.lunarg.com/vulkan/1.3.296/lunarg-vulkan-1.3.296-noble.list
35-
sudo apt update && sudo apt install --yes vulkan-sdk xorg-dev cmake libgtk-3-dev libdbus-1-dev libhdf5-dev libboost-dev
35+
sudo apt update && sudo apt install --yes vulkan-sdk xorg-dev libgtk-3-dev libdbus-1-dev
36+
37+
- name: Install cmake, hdf5, boost, valgrind
38+
run: |
39+
sudo apt-get install --yes cmake libhdf5-dev libboost-dev valgrind
3640
3741
- name: Install Cuda
3842
uses: Jimver/cuda-toolkit@master
@@ -49,9 +53,9 @@ jobs:
4953
- name: Run
5054
working-directory: ${{github.workspace}}
5155
run: |
52-
./build/bin/release/rayx -x -c -m 1 -i Intern/rayx-core/tests/input/BoringImagePlane.rml
53-
./build/bin/release/rayx -x -m 1 -i Intern/rayx-core/tests/input/BoringImagePlane.rml
54-
git checkout -- Intern/rayx-core/tests/input/BoringImagePlane.csv
56+
export RML=Intern/rayx-core/tests/input/METRIX_U41_G1_H1_318eV_PS_MLearn_v114.rml
57+
./build/bin/release/rayx -x -c -V -i $RML
58+
valgrind --error-exitcode=42 ./build/bin/release/rayx -x -V -i $RML
5559
5660
- name: Test
5761
working-directory: ${{github.workspace}}/build/bin/release

.github/workflows/testUbuntuClang.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: |
3333
wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/lunarg.gpg
3434
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.296-noble.list https://packages.lunarg.com/vulkan/1.3.296/lunarg-vulkan-1.3.296-noble.list
35-
sudo apt update && sudo apt install --yes vulkan-sdk xorg-dev cmake libgtk-3-dev libdbus-1-dev libhdf5-dev libboost-dev
35+
sudo apt update && sudo apt install --yes vulkan-sdk xorg-dev libgtk-3-dev libdbus-1-dev
3636
3737
- name: Install llvm
3838
run: |
@@ -41,6 +41,10 @@ jobs:
4141
sudo ./llvm.sh 17
4242
sudo apt-get install --yes libomp-17-dev
4343
44+
- name: Install cmake, hdf5, boost, valgrind
45+
run: |
46+
sudo apt-get install --yes cmake libhdf5-dev libboost-dev valgrind
47+
4448
- name: Configure CMake
4549
run: |
4650
CC="clang-17" CXX="clang++-17" cmake -B ${{github.workspace}}/build \
@@ -53,9 +57,9 @@ jobs:
5357
- name: Run
5458
working-directory: ${{github.workspace}}
5559
run: |
56-
./build/bin/release/rayx -x -c -m 1 -i Intern/rayx-core/tests/input/BoringImagePlane.rml
57-
./build/bin/release/rayx -x -m 1 -i Intern/rayx-core/tests/input/BoringImagePlane.rml
58-
git checkout -- Intern/rayx-core/tests/input/BoringImagePlane.csv
60+
export RML=Intern/rayx-core/tests/input/METRIX_U41_G1_H1_318eV_PS_MLearn_v114.rml
61+
./build/bin/release/rayx -x -c -V -i $RML
62+
valgrind --error-exitcode=42 ./build/bin/release/rayx -x -V -i $RML
5963
6064
- name: Test
6165
working-directory: ${{github.workspace}}/build/bin/release

.github/workflows/testWindows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ jobs:
7979
- name: Run
8080
working-directory: ${{github.workspace}}
8181
run: |
82-
./build/bin/release/rayx -x -c -m 1 -i Intern/rayx-core/tests/input/BoringImagePlane.rml
83-
./build/bin/release/rayx -x -m 1 -i Intern/rayx-core/tests/input/BoringImagePlane.rml
84-
git checkout -- Intern/rayx-core/tests/input/BoringImagePlane.csv
82+
$Env:RML="Intern/rayx-core/tests/input/METRIX_U41_G1_H1_318eV_PS_MLearn_v114.rml"
83+
./build/bin/release/rayx -x -c -V -i $Env:RML
84+
./build/bin/release/rayx -x -V -i $Env:RML
8585
8686
- name: Test
8787
working-directory: ${{github.workspace}}/build/bin/release

0 commit comments

Comments
 (0)