Commit a4d8fe70 authored by sagnowski's avatar sagnowski
Browse files

Another attempt to fix issues with variable expansion

parent 58265cb2

.gitlab-ci.yml

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

  variables:

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

    INSTRUCTIONS_GITLAB: "To fix formatting issues:\n

    PATCH_FILE_NAME: '"$ARTIFACT_BASE_NAME".patch'

    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 "$PATCH_FILE_NAME"\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 "$PATCH_FILE_NAME"\n

      - commit new changes'

  stage: validate

  needs: []

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



    - mkdir tmp-formatting-fix

    - PATCH_FILE_NAME="$ARTIFACT_BASE_NAME.patch" # Must be assigned here so that all variables get expanded

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



    # Print instructions to job output