Commit 9815baa2 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'shared/ci-system-development' into 'main' 

#29 immediate improvements to CI system

See merge request !12
parents 050f3c0c d026e91c

.gitlab-ci.yml

+10 −8
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ stages: 
  extends: .test-job

  tags:

    - ivas-linux



# template for test jobs on linux that need the TESTV_DIR

.test-job-linux-needs-testv-dir:

  extends: .test-job-linux

  before_script:

    - if [ ! -d "$TESTV_DIR" ]; then mkdir -p $TESTV_DIR; fi

    - cp -r scripts/testv/* $TESTV_DIR/
@@ -75,7 +79,7 @@ build-codec-sanitizers-linux: 


# test that runs all modes with 1s input signals

codec-smoke-test:

  extends: .test-job-linux

  extends: .test-job-linux-needs-testv-dir

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

  stage: test
@@ -104,8 +108,8 @@ self-test-on-merge-request: 
    - cd ..

    - rm -rf build/*



    ### backup testvectors from source branch before switching to arget branch -> makes sure that up-to-date testv folder is used in case the branch makes changes to it

    - cp -r scripts/testv scripts/testv.bak

    ### store the current commit hash

    - source_branch_commit_sha=$(git rev-parse HEAD)



    ### checkout version to compare against

    # first delete local target branch to avoid conflicts when branch is cached and there are merge conflicts during fetching
@@ -126,10 +130,8 @@ self-test-on-merge-request: 
    - mv IVAS_dec ../IVAS_dec_ref

    - cd ..



    # TODO: instead check out the source commit again

    ### restore testv folder from branch

    - rm -rf scripts/testv

    - cp -r scripts/testv.bak scripts/testv

    ### re-checkout the commit from the source branch to have up-to-date self_test.py and scripts/testv (and actually everything)

    - git checkout $source_branch_commit_sha



    ### run selftest

    - ls -altr scripts/testv

Makefile

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.P) $(SRCS_LIBDEBUG:.c=.P) $(SRCS 
###############################################################################



.PHONY: all clean clean_unittests clean_all

.NOTPARALLEL: clean clean_unittests clean_all



all: $(CLI_APIENC) $(CLI_APIDEC)

ci/build_all_linux.sh

+5 −7
Original line number Diff line number Diff line
@@ -6,13 +6,11 @@ if [ ! -d "lib_com" ]; then 
fi



# first build codec, everything else needs this anyway

make clean all

make clean all -j

# build unittests

make unittests

make unittests -j

# build prerenderer

cd scripts/prerenderer

make

make -C scripts/prerenderer -j

# build standalone TD object renderer

cd ..

cd td_object_renderer/object_renderer_standalone

make
 
make -C scripts/td_object_renderer/object_renderer_standalone -j

ci/build_codec_instrumented_linux.sh

+1 −1
Original line number Diff line number Diff line
@@ -8,4 +8,4 @@ fi 
cd scripts

./prepare_instrumentation.sh

cd c-code_instrument

make
 
make -j

ci/build_codec_sanitizers_linux.sh

+3 −3
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ fi 
# CI linux container would do this, can stay commented if clang (v13) is in your path

#PATH=$PATH:/usr/lib/llvm-13/bin

make clean

make CLANG=1

make CLANG=1 -j

make clean

make CLANG=2

make CLANG=2 -j

make clean

make CLANG=3
 
make CLANG=3 -j