[airflow] 02/02: Chown should work now when building the documentation (#8600)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit f21618bdae4ba157929477bfb96819b5caa15a78
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Tue Apr 28 13:03:08 2020 +0200

    Chown should work now when building the documentation (#8600)
    
    (cherry picked from commit 1291ded55f9708d464947d878e61945c1b2ad3f3)
---
 .github/workflows/ci.yml |  3 +++
 docs/build               | 18 +++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c48a7ac..21dbcb4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,6 +78,9 @@ jobs:
       CI_JOB_TYPE: "Documentation"
     steps:
       - uses: actions/checkout@master
+      - uses: actions/setup-python@v1
+        with:
+          python-version: '3.6'
       - name: "Build CI image ${{ matrix.python-version }}"
         run: ./scripts/ci/ci_prepare_image_on_ci.sh
       - name: "Build docs"
diff --git a/docs/build b/docs/build
index 3b51212..f9856e9 100755
--- a/docs/build
+++ b/docs/build
@@ -78,12 +78,12 @@ def prepare_directories() -> None:
             # The _api folder should be deleted by then but just in case we should change the ownership
             host_user_id = os.environ["HOST_USER_ID"]
             host_group_id = os.environ["HOST_GROUP_ID"]
-            print(f"Changing ownership of docs/_build folder back to ${host_user_id}:${host_group_id}")
-            run(["sudo", "chown", f'"${host_user_id}":"${host_group_id}"', "_build"], check=True)
+            print(f"Changing ownership of docs/_build folder back to {host_user_id}:{host_group_id}")
+            run(["sudo", "chown", "-R", f'{host_user_id}:{host_group_id}', "_build"], check=True)
             if os.path.exists("_api"):
-                run(["sudo", "chown", f'"${host_user_id}":"${host_group_id}"', "_api"], check=True)
+                run(["sudo", "chown", "-R", f'{host_user_id}:{host_group_id}', "_api"], check=True)
 
-            print(f"Changed ownership of docs/_build folder back to ${host_user_id}:${host_group_id}")
+            print(f"Changed ownership of docs/_build folder back to {host_user_id}:{host_group_id}")
 
         atexit.register(restore_ownership)
 
@@ -198,11 +198,11 @@ def parse_sphinx_warnings(warning_text: str) -> List[DocBuildError]:
     for sphinx_warning in warning_text.split("\n"):
         if not sphinx_warning:
             continue
-        warining_parts = sphinx_warning.split(":", 2)
-        if len(warining_parts) == 3:
+        warning_parts = sphinx_warning.split(":", 2)
+        if len(warning_parts) == 3:
             sphinx_build_errors.append(
                 DocBuildError(
-                    file_path=warining_parts[0], line_no=int(warining_parts[1]), message=warining_parts[2]
+                    file_path=warning_parts[0], line_no=int(warning_parts[1]), message=warning_parts[2]
                 )
             )
         else:
@@ -239,8 +239,8 @@ def build_sphinx_docs() -> None:
         warning_text = tmp_file.read().decode()
         # Remove 7-bit C1 ANSI escape sequences
         warning_text = re.sub(r"\x1B[@-_][0-?]*[ -/]*[@-~]", "", warning_text)
-        sphinx_build_errrors = parse_sphinx_warnings(warning_text)
-        build_errors.extend(sphinx_build_errrors)
+        sphinx_build_errors = parse_sphinx_warnings(warning_text)
+        build_errors.extend(sphinx_build_errors)
 
 
 print("Current working directory: ", os.getcwd())