Commit 728e8126 authored by sagnowski's avatar sagnowski
Browse files

Remove one nesting level from variables

parent 55ec5cbb

.gitlab-ci.yml

+7 −8
Original line number Diff line number Diff line
@@ -406,16 +406,15 @@ clang-format-check: 
    - .rules-merge-request

  variables:

    ARTIFACT_BASE_NAME: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--formatting-fix"

    PATCH_FILE_NAME: '"$ARTIFACT_BASE_NAME".patch'

    INSTRUCTIONS_GITLAB: "To fix formatting issues:\n

    INSTRUCTIONS_GITLAB: 'To fix formatting issues:\n

      - download the diff patch available as artifact of this job\n

      - unzip the artifact and place the patch file in the root directory of your local IVAS repo\n

      - run: git apply $PATCH_FILE_NAME\n

      - commit new changes"

    INSTRUCTIONS_README: "To fix formatting issues:\n

      - run: git apply "$ARTIFACT_BASE_NAME".patch\n

      - commit new changes'

    INSTRUCTIONS_README: 'To fix formatting issues:\n

      - place the patch file in the root directory of your local IVAS repo\n

      - run: git apply $PATCH_FILE_NAME\n

      - commit new changes"

      - run: git apply "$ARTIFACT_BASE_NAME".patch\n

      - commit new changes'

  stage: validate

  needs: []

  timeout: "5 minutes"
@@ -424,7 +423,7 @@ clang-format-check: 
    - if [ $format_problems == 0 ] ; then exit 0; fi



    - mkdir tmp-formatting-fix

    - git diff > "tmp-formatting-fix/$PATCH_FILE_NAME"

    - git diff > "tmp-formatting-fix/$ARTIFACT_BASE_NAME".patch"



    # Print instructions to job output

    - echo -e "$INSTRUCTIONS_GITLAB"