Commit c50598fd authored by Jan Kiene's avatar Jan Kiene
Browse files

archive unified diff instead

parent 4350de07

.gitlab-ci.yml

+5 −6
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ lint: 
format:

  stage: analyze

  variables:

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

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

    ARTIFACT_FOLDER: "formatting-patch"

  tags:

    - linux
@@ -66,15 +66,14 @@ format: 
  script:

    - mkdir $ARTIFACT_FOLDER



    - isort_diff_file="$ARTIFACT_BASE_NAME--isort-formatting-fix.patch"

    - isort --df --check --color --profile black . | tee ${ARTIFACT_FOLDER}/${isort_diff_file} || ret_val_isort=$?

    - isort --profile black . || ret_val_isort=$?

    - black . || ret_val_black=$?

    - git diff > "${ARTIFACT_FOLDER}/${ARTIFACT_BASE_NAME}.patch"



    - black_diff_file="$ARTIFACT_BASE_NAME--black-formatting-fix.patch"

    - black --diff --check . | tee ${ARTIFACT_FOLDER}/${black_diff_file} || ret_val_black=$?

    - if [[ $ret_val_isort != 0 || $ret_val_black != 0 ]]; then exit 1; fi

  artifacts:

    paths:

      - "$ARTIFACT_FOLDER"

    when: on_failure

    name: "$ARTIFACT_BASE_NAME--formatting-patch"

    name: "$ARTIFACT_BASE_NAME"

    expose_as: "formatting patch"