Merge pull request #80 from M-casado/main

EEH-2525 - Fix code rebase
EbiEga · Apr 14, 2023 · 169470d · 169470d
2 parents 6fbf45e + 3cd5bce
commit 169470d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git 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(

diff --git 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
 
 # - #

diff --git 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)

diff --git 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