Skip to content

Commit

Permalink
Merge pull request #47 from DUNE/Liam-CI-test
Browse files Browse the repository at this point in the history
For any pull requests/commits to main, a repo will be built on ubuntu-latest against root-6-30.02, Geant4-10.7.4, and edep-sim head. The YAML file is a bit gross right now but I'll clean it up Soon™.

No build no merge.

Also removed -Werror from the Makefiles in src/ and app/.
  • Loading branch information
LiamOS authored Dec 11, 2023
2 parents 8af648e + 29d2f48 commit e1fe91a
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 2 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: C/C++ CI

on:
push:
branches: [ "main", "Liam-CI-test" ]
pull_request:
branches: [ "main" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Clone TOML
run: git clone https://github.com/ToruNiina/toml11
- name : Install Dependencies
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
- 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
run: cd /home/runner/work/dune-tms/; git clone https://github.com/ClarkMcGrew/edep-sim
- name: Install edep-sim2
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/*
- 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
2 changes: 1 addition & 1 deletion app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ TMS_INC = -I../src

TOML_INC = -I../toml11

CXXFLAGS = -Wall -Wextra -g -fPIC -Werror
CXXFLAGS = -Wall -Wextra -g -fPIC
ifdef DEBUG
CXXFLAGS+=-Og
else
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ EDEP_INC = -I$(EDEPSIM_INC) -I$(CLHEP_INC)

TOML_INC = -I../toml11/

CXXFLAGS = -Wall -Wextra -g -fPIC -Werror
CXXFLAGS = -Wall -Wextra -g -fPIC
ifdef DEBUG
CXXFLAGS+=-Og
else
Expand Down

0 comments on commit e1fe91a

Please sign in to comment.