Commit 8fb4f6ca authored by Jan Kiene's avatar Jan Kiene
Browse files

move anchor up to be able to use it in other part

parent 88ca3306

.gitlab-ci.yml

+22 −22
Original line number Diff line number Diff line
@@ -170,6 +170,28 @@ stages: 
    echo "Commit time was $CI_COMMIT_TIMESTAMP"

    ("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") | Invoke-Expression



.build-merge-target-binaries: &build-merge-target-binaries

  - current_commit_sha=$(git rev-parse HEAD)

  ### build merge target binaries

  - if [ -f $MERGE_TARGET_COMMIT_FILE ]; then

  -   MERGE_REQUEST_TARGET="$(cat "$MERGE_TARGET_COMMIT_FILE")"

  - else

  -   echo "MERGE_TARGET_COMMIT_FILE does not exist, exiting!"

  -   exit 1

  - fi

  - git checkout $MERGE_REQUEST_TARGET

  - *activate-debug-mode-info-if-set

  - make clean

  - make -j >> /dev/null

  - mv ./IVAS_cod ./$MERGE_TARGET_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY

  - mv ./IVAS_dec ./$MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY

  - mv ./IVAS_rend ./$MERGE_TARGET_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY

  - mv ./ISAR_post_rend ./$MERGE_TARGET_POST_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY

  ### Return to current branch

  - git restore .

  - git rev-parse HEAD > $MERGE_TARGET_COMMIT_FILE

  - git checkout $current_commit_sha



# From float CI

.mr-fetch-target-branch: &mr-fetch-target-branch

  # first delete local target branch to avoid conflicts when branch is cached and there are merge conflicts during fetching
@@ -227,28 +249,6 @@ stages: 
  - git rev-parse HEAD > $FLOAT_REF_COMMIT_FILE

  - git checkout $current_commit_sha



.build-merge-target-binaries: &build-merge-target-binaries

  - current_commit_sha=$(git rev-parse HEAD)

  ### build merge target binaries

  - if [ -f $MERGE_TARGET_COMMIT_FILE ]; then

  -   MERGE_REQUEST_TARGET="$(cat "$MERGE_TARGET_COMMIT_FILE")"

  - else

  -   echo "MERGE_TARGET_COMMIT_FILE does not exist, exiting!"

  -   exit 1

  - fi

  - git checkout $MERGE_REQUEST_TARGET

  - *activate-debug-mode-info-if-set

  - make clean

  - make -j >> /dev/null

  - mv ./IVAS_cod ./$MERGE_TARGET_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY

  - mv ./IVAS_dec ./$MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY

  - mv ./IVAS_rend ./$MERGE_TARGET_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY

  - mv ./ISAR_post_rend ./$MERGE_TARGET_POST_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY

  ### Return to current branch

  - git restore .

  - git rev-parse HEAD > $MERGE_TARGET_COMMIT_FILE

  - git checkout $current_commit_sha



.build-float-ref-and-dut-binaries: &build-float-ref-and-dut-binaries

### build reference binaries

  - *build-float-ref-binaries