From a17b75862eac000ce05302969caa220133f68adf Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Wed, 1 Nov 2023 12:14:30 +0100
Subject: [PATCH] Update CI scripts. Remove retaining .bit files (large and not
 useful) and remove RHEL7 specific parts.

---
 .gitlab-ci.yml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78c95e6d..ef042370 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ build:x86:gcc:
   script:
     - mkdir build
     - cd build
-    - cmake3 -DCMAKE_BUILD_TYPE=Release ..
+    - cmake -DCMAKE_BUILD_TYPE=Release ..
     - make -j48 jfjoch
 
 build:x86:icpc:
@@ -34,7 +34,7 @@ build:x86:icpc:
     - source /opt/intel/oneapi/setvars.sh
     - mkdir build
     - cd build
-    - cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON ..
+    - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON ..
     - make -j48 jfjoch
 
 build:x86:aocc:
@@ -52,7 +52,7 @@ build:x86:aocc:
     - source /opt/AMD/aocc-compiler-4.0.0/setenv_AOCC.sh
     - mkdir build
     - cd build
-    - cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON ..
+    - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON ..
     - make -j48 jfjoch
 
 build:x86:vitis_hls:
@@ -75,7 +75,7 @@ build:x86:vitis_hls:
     - source /opt/Xilinx/Vitis_HLS/2022.1/settings64.sh
     - mkdir build
     - cd build
-    - cmake3 ..
+    - cmake ..
     - make hls
 
 test:x86:gcc:
@@ -95,7 +95,7 @@ test:x86:gcc:
   script:
     - mkdir -p build
     - cd build
-    - cmake3 -DCMAKE_BUILD_TYPE=Release -DJFJOCH_COMPILE_TESTS=ON ..
+    - cmake -DCMAKE_BUILD_TYPE=Release -DJFJOCH_COMPILE_TESTS=ON ..
     - make -j48 CatchTest CompressionBenchmark HDF5DatasetWriteTest DataAnalysisPerfTest JFCalibrationPerfTest
     - cd tests
     - ./CatchTest -r junit -o report.xml
@@ -127,7 +127,7 @@ test:x86:crystfel:
     - source /opt/grpc/grpc.sh
     - mkdir -p build
     - cd build
-    - cmake3 -DCMAKE_BUILD_TYPE=Release -DgRPC_FROM_SYSTEM=1 -DJFJOCH_COMPILE_TESTS=ON ..
+    - cmake -DCMAKE_BUILD_TYPE=Release -DgRPC_FROM_SYSTEM=1 -DJFJOCH_COMPILE_TESTS=ON ..
     - make -j8 HDF5DatasetWriteTest
     - cd ../tests/crystfel
     - HDF5DATASET_WRITE_TEST_IMAGES_PER_FILE=0 ../../build/tools/HDF5DatasetWriteTest ../../tests/test_data/compression_benchmark.h5 10
@@ -148,11 +148,10 @@ test:x86:xds_durin:
     - x86
     - xds
   script:
-    - source /opt/rh/devtoolset-10/enable
     - source /opt/grpc/grpc.sh
     - mkdir -p build
     - cd build
-    - cmake3 -DCMAKE_BUILD_TYPE=Release -DgRPC_FROM_SYSTEM=1 -DJFJOCH_COMPILE_TESTS=ON ..
+    - cmake -DCMAKE_BUILD_TYPE=Release -DgRPC_FROM_SYSTEM=1 -DJFJOCH_COMPILE_TESTS=ON ..
     - make -j8 HDF5DatasetWriteTest
     - cd ../tests/xds_durin
     - HDF5DATASET_WRITE_TEST_IMAGES_PER_FILE=0 ../../build/tools/HDF5DatasetWriteTest ../../tests/test_data/compression_benchmark.h5 100
@@ -173,12 +172,11 @@ test:x86:xia2.ssx:
     - x86
     - xds
   script:
-    - source /opt/rh/devtoolset-10/enable
     - source /opt/grpc/grpc.sh
     - mkdir -p build
     - mkdir -p dials_test
     - cd build
-    - cmake3 -DCMAKE_BUILD_TYPE=Release -DgRPC_FROM_SYSTEM=1 -DJFJOCH_COMPILE_TESTS=ON ..
+    - cmake -DCMAKE_BUILD_TYPE=Release -DgRPC_FROM_SYSTEM=1 -DJFJOCH_COMPILE_TESTS=ON ..
     - make -j8 HDF5DatasetWriteTest
     - cd ../dials_test
     - ../build/tools/HDF5DatasetWriteTest ../tests/test_data/compression_benchmark.h5 100
@@ -205,13 +203,12 @@ synthesis:vivado_pcie_100g:
   artifacts:
     paths:
       - build/fpga/*.mcs
-      - build/fpga/*.bit
     expire_in: 1 week
   script:
     - source /opt/grpc/grpc.sh
     - source /opt/Xilinx/Vivado/2022.1/settings64.sh
     - mkdir -p build
     - cd build
-    - cmake3 ..
+    - cmake ..
     - make action_pcie
   needs: ["build:x86:gcc", "build:x86:vitis_hls", "test:x86:gcc"]