move patch into script

Author: alexeagle

.github/workflows/hugo-site-generator.yml

@@ -39,10 +39,6 @@ jobs:
           working-directory: upstream
           run: git checkout ${{ inputs.bcrCommitHash }}
 
-        - name: Patch upstream docs
-          working-directory: upstream
-          run: patch -p1 < ../patches/*.patch
-
         - name: Clean up mdx files
           run: ./cleanup-mdx.sh
 

copy-upstream-docs.sh

@@ -57,6 +57,12 @@ if [ ! -d "$SOURCE_DIR" ]; then
     exit 1
 fi
 
+(
+    cd upstream
+    echo "Patching files"
+    patch -p1 < ../patches/*.patch
+)
+
 echo "Finding all .md files in $SOURCE_DIR..."
 
 # Find all .md files and copy them
@@ -84,5 +90,11 @@ find "$SOURCE_DIR" -name "*.md" -type f | while read -r source_file; do
     awk -f transform-docs.awk "$source_file" > "$target_file"
 done
 
+(
+    cd upstream
+    echo "Undoing patches"
+    git reset --hard
+)
+
 echo "Successfully copied all .md files to .mdx files in root"
 echo "You can now modify the files as needed."

docs.json

@@ -21,11 +21,25 @@
                 "groups": [
                   {
                     "group": "Why Bazel?",
-                    "pages": ["about/why"]
+                    "pages": [
+                      "about/intro",
+                      "about/why",
+                      "about/vision",
+                      "about/roadmap",
+                      "about/faq"
+                    ]
                   },
                   {
                     "group": "Build system basics",
-                    "pages": ["basics"]
+                    "pages": [
+                      "basics",
+                      "basics/build-systems",
+                      "basics/task-based-builds",
+                      "basics/artifact-based-builds",
+                      "basics/distributed-builds",
+                      "basics/dependencies",
+                      "basics/hermeticity"
+                    ]
                   }
                 ]
               },
@@ -34,15 +48,39 @@
                 "groups": [
                   {
                     "group": "Install",
-                    "pages": ["install"]
+                    "pages": [
+                      "install",
+                      "install/bazelisk",
+                      "install/os-x",
+                      "install/windows",
+                      "install/ubuntu",
+                      "install/suse",
+                      "install/docker-container",
+                      "install/compile-source",
+                      "install/completion",
+                      "install/ide"
+                    ]
                   },
                   {
                     "group": "First build tutorials",
-                    "pages": ["start/getting-started"]
+                    "pages": [
+                      "start/cpp",
+                      "start/java",
+                      "start/android-app",
+                      "start/ios-app"
+                    ]
                   },
                   {
                     "group": "Concepts",
-                    "pages": ["concepts/build-files"]
+                    "pages": [
+                      "concepts/build-ref",
+                      "concepts/labels",
+                      "concepts/build-files",
+                      "concepts/dependencies",
+                      "concepts/visibility",
+                      "concepts/platforms",
+                      "concepts/hermeticity"
+                    ]
                   }
                 ]
               },