Merge 3f11068f9c0290599ec67247effd0af67b345d73 into ddcc539076f3b78bd9c41afc55e45bcb51ba7bc0

.github/workflows/docs-and-testcov.yml

@@ -6,9 +6,9 @@ concurrency:
 
 on:
   push:
-    branches: [main, update_docs_workflow]
-  # pull_request:
-  #   branches: [main]
+    branches: [main]
+#   pull_request:
+#     branches: [main]
   workflow_dispatch:
 
 permissions:
@@ -101,14 +101,18 @@ jobs:
           cp last-commit-date.json target/doc/rustframe/
           mkdir -p target/doc/rustframe/.github
           cp .github/rustframe_logo.png target/doc/rustframe/.github/
-          echo "<meta http-equiv=\"refresh\" content=\"0; url=rustframe\">" > target/doc/index.html
+
+          mkdir -p target/doc/docs
+          mv target/doc/rustframe/ target/doc/docs/
+
+          echo "<meta http-equiv=\"refresh\" content=\"0; url=docs\">" > target/doc/index.html
 
       - name: Upload Pages artifact
-        # if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
         uses: actions/upload-pages-artifact@v3
         with:
           path: target/doc/
 
       - name: Deploy to GitHub Pages
-        # if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
-        uses: actions/deploy-pages@v4
+        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+        uses: actions/deploy-pages@v4