using system_template with join instead of in args

Author: maureeungaro

.github/workflows/docker.yml

@@ -212,6 +212,7 @@ jobs:
           fi
 
       - name: Summary (manifest)
+        if: ${{ always() }} # run regardless of earlier step outcomes
         shell: bash
         env:
           IMAGE: ${{ needs.discover.outputs.image }}
@@ -252,6 +253,7 @@ jobs:
           ls -l "$GITHUB_WORKSPACE/summaries"
 
       - name: Upload summary artifact (manifest)
+        if: ${{ always() }} # run regardless of earlier step outcomes
         uses: actions/upload-artifact@v4
         with:
           name: summary-${{ matrix.gemc_tag }}-${{ matrix.geant4_tag }}-${{ matrix.image }}-${{ matrix.image_tag }}-manifest

.github/workflows/sanitize.yaml

@@ -72,7 +72,7 @@ jobs:
           echo "Manual build for sanitizer: ${{ matrix.sanitizer }} completed"
 
       - name: Package sanitizer logs
-        if: ${{ always() }}
+        if: ${{ always() }} # run regardless of earlier step outcomes
         shell: bash
         run: |
           set -euo pipefail
@@ -98,7 +98,7 @@ jobs:
 
   build-with-sanitizer-final:
     name: Sanitize - summary
-    if: ${{ always() }}
+    if: ${{ always() }} # run regardless of earlier step outcomes
     needs: [ build-with-sanitizer ]
     runs-on: ubuntu-latest
     strategy:

api/meson.build

@@ -1,22 +1,24 @@
-api_dir = get_option('prefix') + '/api/'
+api_dir = join_paths(get_option('prefix'), 'api')
 build_root = meson.project_build_root()
 
 test_env = environment()
 test_env.set('PYTHONDONTWRITEBYTECODE', '1')
 test_env.prepend('PYTHONPATH', api_dir)
 python_exe = import('python').find_installation('python3')
+system_template = join_paths(api_dir, 'system_template.py')
 
 install_subdir(meson.current_source_dir(), install_dir : '.')
 
 test('api_template_help',
      python_exe,
      env: test_env,
-     args : [api_dir + 'system_template.py', '-h'])
+     args : [system_template, '-h'])
 
 test('api_show_solid_creators',
      python_exe,
      env: test_env,
-     args : [api_dir + 'system_template.py', '-sl'])
+     args : [system_template, '-sl'],
+)
 
 # Test all solid creators
 g4objects = {
@@ -35,27 +37,27 @@ foreach volume: g4objects.keys()
          python_exe,
          is_parallel: false,
          env: test_env,
-         args : [api_dir + 'system_template.py', '-gv', volume])
+         args : [system_template, '-gv', volume])
     test('api_template_show_code_for_volume' + volume + '_with_parameters_' + pars.replace(' ', ''),
          python_exe,
          is_parallel: false,
          env: test_env,
-         args : [api_dir + 'system_template.py', '-gv', volume, '-gvp',  pars.replace(' ', '')])
+         args : [system_template, '-gv', volume, '-gvp',  pars.replace(' ', '')])
 endforeach
 
 test('api_show_template_code_for_G4Cons',
      python_exe,
      is_parallel: false,
      env: test_env,
-     args : [api_dir + 'system_template.py', '-gv', 'G4Cons', '-silent'])
+     args : [system_template, '-gv', 'G4Cons', '-silent'])
 
 test_dir = join_paths(build_root, 'test')
 test('api_create_system',
      python_exe,
      is_parallel: false,
      env: test_env,
-     args : [api_dir + 'system_template.py', '-s', 'test'],
-     workdir : test_dir,
+     args : [system_template, '-s', 'test'],
+     workdir : build_root,
      priority : 5)
 foreach format : ['ascii', 'sqlite']
     test('api_template_build_geometry_in_test_for_format_' + format,
@@ -86,15 +88,15 @@ foreach volume: g4objects.keys()
          python_exe,
          is_parallel: false,
          env: test_env,
-         args : [api_dir + 'system_template.py', '-s', test_name],
-         workdir : test_dir,
+         args : [system_template, '-s', test_name],
+         workdir : build_root,
          priority : 4)
     test('api_template_replace_geometry_with' + volume,
          python_exe,
          is_parallel: false,
          env: test_env,
-         args: [api_dir + 'system_template.py', '-gv', volume, '-gvp', pars, geo_py, sub_name],
-         workdir : test_dir,
+         args: [system_template, '-gv', volume, '-gvp', pars, geo_py, sub_name],
+         workdir : build_root,
          priority : -3)
     foreach format : ['ascii', 'sqlite']
         test('api_template_build_geometry_in_test_of_replacing_geometry_with' + volume + '_with_format' + format,

meson.build

@@ -20,7 +20,7 @@ if get_option('buildtype') == 'debug'
     add_project_arguments('-O2', language : 'cpp')
 endif
 
-api_dir = get_option('prefix') + '/api/'
+api_dir = join_paths(get_option('prefix'), 'api')
 test_env = environment()
 test_env.set('PYTHONDONTWRITEBYTECODE', '1')
 test_env.prepend('PYTHONPATH', api_dir)