diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 641901aab703e545873d87f0107dbe226a12cbab..53c44601ece6f2c7641c7776dcfaf096d5aa9875 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,14 +5,14 @@ build: - ./make artifacts: paths: - - "build/apdBatchSetter" - - "build/apdBoxSetter" - - "build/apdLocationSetter" - - "build/getIrradiationDose" - - "build/getLocations" - - "build/getU100" - - "build/makeSerialList" - - "build/testXmlStructure" + - "build/auto/apdBatchSetter" + - "build/auto/apdBoxSetter" + - "build/auto/apdLocationSetter" + - "build/auto/getIrradiationDose" + - "build/auto/getLocations" + - "build/auto/getU100" + - "build/auto/makeSerialList" + - "build/auto/testXmlStructure" test: stage: test diff --git a/make b/make index e2188b207dfc03bd243311e166ab99bf351465b6..3dfbc316a38e229fbd465ad9020286b44ce3d026 100755 --- a/make +++ b/make @@ -3,8 +3,9 @@ setenv proddb_clientlib_includes /home/tau/jreher/git/proddb-clientlib/ setenv proddb_clientlib_libpath /home/tau/jreher/git/proddb-clientlib/build/ -rm builddir -mkdir builddir -cd builddir -cmake3 -DCMAKE_C_COMPILER=/usr/local/bin/gcc -DCMAKE_CXX_COMPILER=/usr/local/bin/g++ .. +rm build/auto +mkdir build +mkdir build/auto/ +cd build/auto/ +cmake3 -DCMAKE_C_COMPILER=/usr/local/bin/gcc -DCMAKE_CXX_COMPILER=/usr/local/bin/g++ ../.. make