Skip to content

Commit 669b509

Browse files
maureeungaromaureeungaro
committed
saving progress before using internal_dependencies
1 parent b37d921 commit 669b509

33 files changed

Lines changed: 132 additions & 38 deletions

File tree

‎.github/workflows/sanitize.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,6 @@ jobs:
101101
if: ${{ always() }} # run regardless of earlier step outcomes
102102
needs: [ build-with-sanitizer ]
103103
runs-on: ubuntu-latest
104-
strategy:
105-
fail-fast: false
106-
matrix: ${{ fromJSON(needs.discover.outputs.matrix_sanitize) }}
107104
steps:
108105
- name: Fail if any matrix entry failed
109106
if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
@@ -114,4 +111,3 @@ jobs:
114111
- name: Pass
115112
run: |
116113
echo "### All sanitizer jobs passed." >> $GITHUB_STEP_SUMMARY
117-
echo "### Uploaded artifact: logs-${{ matrix.baseos }}-${{ matrix.arch }}-${{ matrix.sanitizer }}" >> $GITHUB_STEP_SUMMARY

‎actions/meson.build‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
sub_dir_name = meson.current_source_dir().split('/').get(-1)
2+
internal_deps = []
3+
24
LD += {
35
'name' : sub_dir_name,
46
'sources' : files(
@@ -16,4 +18,5 @@ LD += {
1618
'run/gRun.h'
1719
),
1820
'dependencies' : [yaml_cpp_dep, clhep_deps, qt6_deps, geant4_core_deps],
21+
'internal_dependencies' : internal_deps,
1922
}

‎dbselect/meson.build‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
sub_dir_name = meson.current_source_dir().split('/').get(-1)
2+
internal_deps = []
23

34
with_gui = ['']
45
if get_option('i_test')
56
with_gui = ['-gui']
67
endif
78

89
example_source = files('examples/test_dbselect.cc')
9-
examples_dir = get_option('prefix') + '/test/' + sub_dir_name
10-
dbhost = ['-sql=' + examples_dir + '/gemc.db']
11-
gsystem = ['-gsystem="[{name: b1}]"']
12-
1310
verbosity = ['-verbosity.dbselect=2',
1411
'-debug.dbselect=true',
1512
'-verbosity.gsystem=2',
1613
'-debug.gsystem=true']
1714

15+
examples_dir = get_option('prefix') + '/test/' + sub_dir_name
16+
dbhost = ['-sql=' + examples_dir + '/gemc.db']
17+
gsystem = ['-gsystem="[{name: b1}]"']
18+
1819
sources = files(
1920
'dbselect_options.cc',
2021
'dbselectView.cc',
@@ -49,6 +50,7 @@ LD += {
4950
'moc_headers' : moc_headers,
5051
'qrc_examples_sources' : qrc_examples_sources,
5152
'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_core_deps],
53+
'internal_dependencies' : internal_deps,
5254
'geo_build' : geo_build,
5355
'examples' : examples
5456
}

‎eventDispenser/meson.build‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
sub_dir_name = meson.current_source_dir().split('/').get(-1)
2+
internal_deps = []
23

34
example_source = files('examples/event_dispenser_example.cc')
4-
55
verbosities = ['-verbosity.eventdispenser=2',
66
'-debug.eventdispenser=true'
77
]
@@ -19,7 +19,10 @@ LD += {
1919
'eventDispenser_options.h',
2020
'eventDispenserConventions.h'
2121
),
22+
2223
'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
24+
'internal_dependencies' : internal_deps,
25+
2326
'examples' : {
2427
'test_event_dispenser' : [example_source, [weight_file_option, '-n=1000', ]],
2528
'test_event_dispenser_verbose' : [example_source, [weight_file_option, '-n=1000'] + verbosities]

‎g4dialog/meson.build‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
sub_dir_name = meson.current_source_dir().split('/').get(-1)
2+
internal_deps = []
23

34
with_gui = ['']
45
if get_option('i_test')
56
with_gui = ['-gui']
67
endif
78

89
example_source = files('examples/g4dialog_example.cc')
9-
1010
verbosities = [
1111
'-verbosity.g4dialog=2',
1212
'-debug.g4dialog=true'
@@ -39,6 +39,7 @@ LD += {
3939
'headers' : headers,
4040
'moc_headers' : moc_headers,
4141
'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps],
42+
'internal_dependencies' : internal_deps,
4243
'additional_includes' : ['g4dialog', 'g4dialog/tabs'],
4344
'examples' : examples
4445
}

‎g4display/meson.build‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
sub_dir_name = meson.current_source_dir().split('/').get(-1)
2+
internal_deps = []
23

34
with_gui = ['']
45
if get_option('i_test')
56
with_gui = ['-gui']
67
endif
78

89
example_source = files('examples/g4display_example.cc')
9-
1010
verbosities = ['-verbosity.g4display=2',
1111
'-debug.g4display=true',
1212
'-verbosity.g4scene=2',
@@ -53,6 +53,7 @@ LD += {
5353
'moc_headers' : moc_headers,
5454
'qrc_examples_sources' : qrc_examples_sources,
5555
'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps, ogl_deps],
56+
'internal_dependencies' : internal_deps,
5657
'additional_includes' : ['g4display', 'g4display/tabs'],
5758
'examples' : examples
5859
}

‎g4system/meson.build‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
sub_dir_name = meson.current_source_dir().split('/').get(-1)
2+
internal_deps = []
23

34
example_source = files('examples/g4system_example.cc')
45
examples_dir = get_option('prefix') + '/test/' + sub_dir_name
@@ -35,7 +36,10 @@ LD += {
3536
'g4objectsFactories/cad/CADMesh.hh',
3637
'g4objectsFactories/cad/cadSystemFactory.h',
3738
),
39+
3840
'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps, assimp_dep],
41+
'internal_dependencies' : internal_deps,
42+
3943
'additional_includes' : ['g4system', 'g4system/g4objectsFactories', 'g4system/g4objectsFactories/g4native', 'g4system/g4objectsFactories/cad'],
4044
'geo_build' : {
4145
'test_g4system_geo' : [files('examples/example.py')]

‎gbase/meson.build‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
sub_dir_name = meson.current_source_dir().split('/').get(-1)
2+
internal_deps = []
3+
24
example_source = files('examples/test_gbase.cc')
35
verbosity = [
46
'-verbosity.gdetector=2',
@@ -13,6 +15,7 @@ LD += {
1315
'gbase.h',
1416
),
1517
'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
18+
'internal_dependencies' : internal_deps,
1619

1720
'examples' : {
1821
'test_gbase' : [example_source, verbosity],

‎gboard/meson.build‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
sub_dir_name = meson.current_source_dir().split('/').get(-1)
2+
internal_deps = []
23

34
with_gui = ['']
45
if get_option('i_test')
56
with_gui = ['-gui']
67
endif
78

89
example_source = files('examples/gboard_example.cc')
9-
1010
verbosities = [
1111
'-verbosity.gboard=2',
1212
'-debug.gboard=true']
@@ -37,6 +37,7 @@ LD += {
3737
'headers' : headers,
3838
'moc_headers' : moc_headers,
3939
'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_core_deps],
40+
'internal_dependencies' : internal_deps,
4041
'additional_includes' : ['gboard'],
4142
'examples' : examples
4243
}

‎gdata/meson.build‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
sub_dir_name = meson.current_source_dir().split('/').get(-1)
2+
internal_deps = []
23

34
example_event_source = files('examples/event_example.cc')
45
example_frame_source = files('examples/gframe_example.cc')
@@ -43,7 +44,10 @@ LD += {
4344
'frame/gFrameDataCollection.h'
4445
),
4546
'additional_includes' : ['gdata', 'gdata/event', 'gdata/run'],
47+
4648
'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
49+
'internal_dependencies' : internal_deps,
50+
4751
'examples' : {
4852
'test_gdata_event' : [example_event_source, ''],
4953
'test_gdata_event_verbose' : [example_event_source, verbosities],

0 commit comments

Comments
 (0)