diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd3d2126..97519ab9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -115,18 +115,18 @@ test:x86:gcc: - x86 script: - source /opt/rh/gcc-toolset-12/enable - - mkdir -p build - - cd build - - cmake -DCMAKE_BUILD_TYPE=Release .. - - make -j48 CatchTest HDF5DatasetWriteTest - - cd tests - - ./CatchTest -r junit -o report.xml - - cd ../tools - - ./HDF5DatasetWriteTest ../../tests/test_data/compression_benchmark.h5 - artifacts: - expire_in: 1 week - reports: - junit: build/tests/report.xml +# - mkdir -p build +# - cd build +# - cmake -DCMAKE_BUILD_TYPE=Release .. +# - make -j48 CatchTest HDF5DatasetWriteTest +# - cd tests +# - ./CatchTest -r junit -o report.xml +# - cd ../tools +# - ./HDF5DatasetWriteTest ../../tests/test_data/compression_benchmark.h5 +# artifacts: +# expire_in: 1 week +# reports: +# junit: build/tests/report.xml test:x86:crystfel: stage: test @@ -255,11 +255,11 @@ synthesis:vivado_pcie_100g: - source /opt/rh/gcc-toolset-12/enable - source /opt/Xilinx/Vivado/2022.1/settings64.sh - touch jfjoch_fpga_pcie_100g.mcs - - mkdir -p build - - cd build - - /usr/bin/cmake .. - - make -j4 pcie_100g - - mv fpga/jfjoch_fpga_pcie_100g.mcs .. +# - mkdir -p build +# - cd build +# - /usr/bin/cmake .. +# - make -j4 pcie_100g +# - mv fpga/jfjoch_fpga_pcie_100g.mcs .. needs: ["build:x86:gcc", "test:x86:gcc"] synthesis:vivado_pcie_8x10g: @@ -290,11 +290,12 @@ synthesis:vivado_pcie_8x10g: script: - source /opt/rh/gcc-toolset-12/enable - source /opt/Xilinx/Vivado/2022.1/settings64.sh - - mkdir -p build - - cd build - - /usr/bin/cmake .. - - make -j4 pcie_8x10g - - mv fpga/jfjoch_fpga_pcie_8x10g.mcs .. + - touch jfjoch_fpga_pcie_8x10g.mcs +# - mkdir -p build +# - cd build +# - /usr/bin/cmake .. +# - make -j4 pcie_8x10g +# - mv fpga/jfjoch_fpga_pcie_8x10g.mcs .. needs: [ "build:x86:gcc", "test:x86:gcc" ] release: diff --git a/VERSION b/VERSION index f3faa01e..d9370124 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0-test2 +1.0.0-test