From 3bac6a7717cca210ac5d3ad6a7ff1796d95cbbad Mon Sep 17 00:00:00 2001 From: M-casado Date: Thu, 13 Apr 2023 16:20:29 +0100 Subject: [PATCH 1/4] EEH-2525 - Amend ``git rm`` --- .github/workflows/markdown_creation.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/markdown_creation.yml b/.github/workflows/markdown_creation.yml index 1ea3c970..f4d27a85 100644 --- a/.github/workflows/markdown_creation.yml +++ b/.github/workflows/markdown_creation.yml @@ -63,6 +63,9 @@ jobs: # We add new additions git add $markdown_dir/* # And add to stage the deleted files as well - git rm $(git ls-files --deleted "$markdown_dir") + deleted_files=$(git ls-files --deleted "$markdown_dir") + if [ -n "$deleted_files" ]; then + git rm $deleted_files + fi git commit -m "JSON Schemas to Markdown - $today" git push origin main \ No newline at end of file From 9cffedb9741079a6032151317f148f06c3376b12 Mon Sep 17 00:00:00 2001 From: M-casado Date: Thu, 13 Apr 2023 16:35:13 +0100 Subject: [PATCH 2/4] EEH-2525 - Fix missing import comma --- .github/scripts/utils/json_manipulation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/utils/json_manipulation.py b/.github/scripts/utils/json_manipulation.py index 4bedf7b7..803717d1 100644 --- a/.github/scripts/utils/json_manipulation.py +++ b/.github/scripts/utils/json_manipulation.py @@ -18,7 +18,7 @@ from typing import Union from .string_manipulation import add_newlines, \ is_semantic_version, \ - is_higher_version + is_higher_version, \ replace_after_string_in_url # - # From 1529ae815ffab36acacf64024166c65bcb08d179 Mon Sep 17 00:00:00 2001 From: M-casado Date: Thu, 13 Apr 2023 16:58:38 +0100 Subject: [PATCH 3/4] EEH-2525 - Fixed missing import --- .github/scripts/utils/json_validation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/utils/json_validation.py b/.github/scripts/utils/json_validation.py index 626e0ad5..5b79c6c0 100644 --- a/.github/scripts/utils/json_validation.py +++ b/.github/scripts/utils/json_validation.py @@ -18,7 +18,7 @@ # Helper functions # -# def request_validation( - data_filepath: Union[str, os.DirEntry[str]], validator_url: str, headers: dict = None + data_filepath: str, validator_url: str, headers: dict = None ) -> requests.models.Response: """ Function that, given a data_filepath (e.g. "path/to/file.json"), a validation URL (e.g. http://localhost:3020/validate) From 4b6b35d480a265b071bb4782d540a9724109555e Mon Sep 17 00:00:00 2001 From: M-casado Date: Fri, 14 Apr 2023 03:47:20 +0100 Subject: [PATCH 4/4] EEH-2525 - Fix changed argumet --- .github/scripts/request_validation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/request_validation.py b/.github/scripts/request_validation.py index d6e0ddfc..7817de02 100644 --- a/.github/scripts/request_validation.py +++ b/.github/scripts/request_validation.py @@ -27,7 +27,7 @@ request = request_validation( data_filepath=file, - curl_URL=curl_URL + validator_url=curl_URL ) val_error = get_errors_response(