diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3294f3b..69a30745 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ stages: - build - test - synthesis + - release build:x86:gcc: stage: build @@ -112,21 +113,20 @@ test:x86:gcc: tags: - gcc - x86 - - ib 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 @@ -226,13 +226,9 @@ test:x86:xia2.ssx: - source /usr/local/dials-v3-17-0/dials_env.sh - xia2.ssx image=writing_test_master.h5 space_group=P43212 unit_cell=78.551,78.551,36.914,90.000,90.000,90.000 -synthesis:release_test: - stage: synthesis - script: - ls *.tar.gz - synthesis:vivado_pcie_100g: stage: synthesis + dependencies: [] variables: GIT_SUBMODULE_STRATEGY: recursive CC: gcc @@ -258,15 +254,17 @@ synthesis:vivado_pcie_100g: 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_100g - - mv fpga/jfjoch_fpga_pcie_100g.mcs .. + - 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 .. needs: ["build:x86:gcc", "test:x86:gcc"] synthesis:vivado_pcie_8x10g: stage: synthesis + dependencies: [] variables: GIT_SUBMODULE_STRATEGY: recursive CC: gcc @@ -292,9 +290,25 @@ 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: + stage: release + when: manual + dependencies: + - synthesis:vivado_pcie_8x10g + - synthesis:vivado_pcie_100g + - build:x86:frontend + - build:x86:driver + script: + - export PACKAGE_VERSION=`head -n1 VERSION` + - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file jfjoch_driver.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/jungfraujoch/${PACKAGE_VERSION}/jfjoch_driver.tar.gz"' + - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file jfjoch_frontend.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/jungfraujoch/${PACKAGE_VERSION}/jfjoch_frontend.tar.gz"' + - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file jfjoch_fpga_pcie_100g.mcs "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/jungfraujoch/${PACKAGE_VERSION}/jfjoch_fpga_pcie_100g.mcs"' + - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file jfjoch_fpga_pcie_8x10g.mcs "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/jungfraujoch/${PACKAGE_VERSION}/jfjoch_fpga_pcie_8x10g.mcs"' diff --git a/VERSION b/VERSION index 2464604e..d9370124 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0-rc0 +1.0.0-test