Commit 6ac80834 authored by norvell's avatar norvell
Browse files

Apply 7 suggestion(s) to 1 file(s) 



Co-authored-by: default avatarFabian Müller <fabian.mueller@iis.fraunhofer.de>
parent a342cc68

.gitlab-ci.yml

+7 −7
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ stages: 
  - 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)

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

  - else

  -   echo "MERGE_TARGET_COMMIT_FILE does not exist, exiting!"

  -   exit 1
@@ -1077,10 +1077,10 @@ branch-is-up-to-date-with-target-pre: 
        echo "Your branch is behind the target branch, run 'git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME' to update."

        exit 1

      fi

    - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME

    - TARGET_COMMIT=$(git rev-parse origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME)

    - git fetch origin "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"

    - TARGET_COMMIT="$(git rev-parse "origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME")"

    - echo "TARGET_COMMIT is $TARGET_COMMIT"

    - echo $TARGET_COMMIT > $MERGE_TARGET_COMMIT_FILE

    - echo "$TARGET_COMMIT" > "$MERGE_TARGET_COMMIT_FILE"

  artifacts:

    paths:

      - $MERGE_TARGET_COMMIT_FILE
@@ -1148,10 +1148,10 @@ branch-is-up-to-date-with-target-pre: 
        echo -e "Your branch is $commits_behind_count commits behind the target branch, run\n\tgit pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME\nto update."

        exit 1

      fi

    - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME

    - TARGET_COMMIT=$(git rev-parse origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME)

    - git fetch origin "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"

    - TARGET_COMMIT="$(git rev-parse "origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME")"

    - echo "TARGET_COMMIT is $TARGET_COMMIT"

    - echo $TARGET_COMMIT > $MERGE_TARGET_COMMIT_FILE

    - echo "$TARGET_COMMIT" > "$MERGE_TARGET_COMMIT_FILE"

  artifacts:

    paths:

      - $MERGE_TARGET_COMMIT_FILE