Light restructure of workflow yaml file

DUNE · Jan 1, 2024 · 8d20d2e · 8d20d2e
1 parent 3b92ab4
commit 8d20d2e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -16,15 +16,16 @@ jobs:
     - name: Clone TOML
       run: git clone https://github.com/ToruNiina/toml11
     - name: Install Dependencies
-      run: sudo apt-get -y update
-      run: sudo apt-get install libgl2ps-dev gfortran libpcre3-dev xlibmesa-glu-dev libglew-dev libftgl-dev libmysqlclient-dev libfftw3-dev libcfitsio-dev graphviz-dev libavahi-compat-libdnssd-dev libldap2-dev python3-dev python3-numpy libxml2-dev libkrb5-dev libgsl0-dev qtwebengine5-dev nlohmann-json3-dev
+      run: sudo apt-get -y update; sudo apt-get install libgl2ps-dev gfortran libpcre3-dev xlibmesa-glu-dev libglew-dev libftgl-dev libmysqlclient-dev libfftw3-dev libcfitsio-dev graphviz-dev libavahi-compat-libdnssd-dev libldap2-dev python3-dev python3-numpy libxml2-dev libkrb5-dev libgsl0-dev qtwebengine5-dev nlohmann-json3-dev
     - name: Install Geant4
       run: cd /home/runner/work/dune-tms/; wget -q https://cern.ch/geant4-data/releases/lib4.10.7.p04/Linux-g++8.3.0-CC7.tar.gz; tar xzf Linux-g++8.3.0-CC7.tar.gz; export PATH=$PATH:/home/runner/work/dune-tms/Geant4-10.7.4-Linux/bin/; export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/runner/work/dune-tms/Geant4-10.7.4-Linux/lib64/
     - name: Install ROOT
       run: cd /home/runner/work/dune-tms/; wget -q https://root.cern/download/root_v6.30.02.Linux-ubuntu22.04-x86_64-gcc11.4.tar.gz; tar xzf root_v6.30.02.Linux-ubuntu22.04-x86_64-gcc11.4.tar.gz; source /home/runner/work/dune-tms/root/bin/thisroot.sh; export ROOT_DIR=/home/runner/work/dune-tms/root/cmake; export CMAKE_MODULE_PATH=/home/runner/work/dune-tms/root/cmake; cat /home/runner/work/dune-tms/root/bin/thisroot.sh
-    - name: Install edep-sim
+    - name: Setup edep-sim
       run: cd /home/runner/work/dune-tms/
       run: git clone https://github.com/ClarkMcGrew/edep-sim
-      run: cd /home/runner/work/dune-tms/edep-sim; mkdir -p build; mkdir -p /home/runner/work/dune-tms/edep-sim/Linux; cd build; ls ../../; Geant4_DIR=/home/runner/work/dune-tms/Geant4-10.7.4-Linux/ ROOT_DIR=/home/runner/work/dune-tms/root/cmake CMAKE_MODULE_PATH=/home/runner/work/dune-tms/Geant4-10.7.4-Linux:/home/runner/work/dune-tms/root/cmake cmake ../ -DVDT_LIBRARY=/home/runner/work/dune-tms/root/lib/libvdt.so -DVDT_INCLUDE_DIR=/home/runner/work/dune-tms/root/include/ -DCMAKE_MODULE_PATH=/home/runner/work/dune-tms/root/cmake:/home/runner/work/dune-tms/Geant4-10.7.4-Linux/ -DROOT_DIR=/home/runner/work/dune-tms/root/cmake -DGeant4_DIR=/home/runner/work/dune-tms/Geant4-10.7.4-Linux/ -DEDEPSIM_READONLY=FALSE -DCMAKE_INSTALL_PREFIX=/home/runner/work/dune-tms/edep-sim/Linux; make; make install; ls /home/runner/work/dune-tms/edep-sim/Linux/*
+      run: cd /home/runner/work/dune-tms/edep-sim; mkdir -p build; mkdir -p /home/runner/work/dune-tms/edep-sim/Linux; cd build
+    - name: Install edep-sim
+      run: Geant4_DIR=/home/runner/work/dune-tms/Geant4-10.7.4-Linux/ ROOT_DIR=/home/runner/work/dune-tms/root/cmake CMAKE_MODULE_PATH=/home/runner/work/dune-tms/Geant4-10.7.4-Linux:/home/runner/work/dune-tms/root/cmake cmake ../ -DVDT_LIBRARY=/home/runner/work/dune-tms/root/lib/libvdt.so -DVDT_INCLUDE_DIR=/home/runner/work/dune-tms/root/include/ -DCMAKE_MODULE_PATH=/home/runner/work/dune-tms/root/cmake:/home/runner/work/dune-tms/Geant4-10.7.4-Linux/ -DROOT_DIR=/home/runner/work/dune-tms/root/cmake -DGeant4_DIR=/home/runner/work/dune-tms/Geant4-10.7.4-Linux/ -DEDEPSIM_READONLY=FALSE -DCMAKE_INSTALL_PREFIX=/home/runner/work/dune-tms/edep-sim/Linux; make; make install; ls /home/runner/work/dune-tms/edep-sim/Linux/*
     - name: Make dune-tms
       run: ls /home/runner/work/dune-tms/; cd /home/runner/work/dune-tms/dune-tms; export PATH=$PATH:/home/runner/work/dune-tms/Geant4-10.7.4-Linux/bin/:/home/runner/work/dune-tms/root/bin; export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/runner/work/dune-tms/Geant4-10.7.4-Linux/lib64/:/home/runner/work/dune-tms/root/lib; EDEPSIM_LIB=/home/runner/work/dune-tms/edep-sim/Linux/lib EDEPSIM_INC=/home/runner/work/dune-tms/edep-sim/Linux/include CLHEP_INC=/home/runner/work/dune-tms/Geant4-10.7.4-Linux/include/Geant4 make