Commit c20ae7e0 authored by Jan Kiene's avatar Jan Kiene
Browse files

adjust build jobs to new Makefile/CMakeLists.txt

parent 207ce65d
Loading
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ build-codec-linux-clang-make:
  script:
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/activate-Werror-linux.sh
    - make -j CLANG=0
    - make -j

build-codec-linux-gcc-make:
  rules:
@@ -37,7 +37,7 @@ build-codec-linux-gcc-make:
  script:
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/activate-Werror-linux.sh
    - make -j
    - make -j GCC=1

# ensure that codec builds on linux with cmake
build-codec-linux-clang-cmake:
@@ -59,7 +59,7 @@ build-codec-linux-clang-cmake:
        bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
      fi
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/activate-Werror-linux.sh
    - cmake -B cmake-build -G "Unix Makefiles" -DCLANG=0
    - cmake -B cmake-build -G "Unix Makefiles"
    - cmake --build cmake-build -- -j

# ensure that codec builds on linux with instrumentation active
@@ -85,7 +85,7 @@ build-codec-linux-instrumented-clang-make:
        INSTRUMENTATION_ARGS="-m MEM_ONLY"
      fi
    - bash scripts/prepare_instrumentation.sh $INSTRUMENTATION_ARGS
    - make -j -C $INSTR_DIR CLANG=0
    - make -j -C $INSTR_DIR

# make sure that the codec builds with msan, asan and usan
build-codec-sanitizers-clang-linux:
@@ -125,7 +125,7 @@ build-codec-linux-debugging-clang-make:
  script:
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/enable-debugging-macro.sh
    - make -j CLANG=0
    - make -j

build-codec-windows-msbuild:
  rules: