Merge branch 'master' into dev

.github/workflows/docs.yml

@@ -6,16 +6,20 @@ on:
       - master
 
 permissions:
-  contents: write
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: pages
+  cancel-in-progress: false
 
 jobs:
-  deploy-docs:
+  build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup Python 3.12
         uses: actions/setup-python@v5
@@ -33,11 +37,29 @@ jobs:
       - name: Install MkDocs
         run: pip install mkdocs-material mkdocs-with-pdf
 
-      - name: Configure Git
+      - name: Build Documentation
-        run: |
+        run: mkdocs build
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-
-      - name: Deploy to GitHub Pages
-        run: mkdocs gh-deploy --force
         working-directory: doc/lwc-doc
+
+      - name: Upload Pages artifact
+        uses: actions/upload-pages-artifact@v1.0.0
+        with:
+          path: doc/lwc-doc/site/
+
+  deploy-github:
+    if: github.server_url == 'https://github.com'
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+    steps:
+      - name: Deploy to GitHub Pages
+        uses: actions/deploy-pages@v4
+
+  deploy-gitverse:
+    if: github.server_url != 'https://github.com'
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to GitVerse Pages
+        uses: actions/deploy-pages@v1.0.0

README.md

@@ -30,7 +30,7 @@ ROS 2 пакеты для управления роботом **KUKA LBR IIWA 7
 Для установки запустите скрипт одной командой:
 
 ```bash
-curl -fsSL https://gitverse.ru/api/repos/daniel-robotics/lightweight-cobot/raw/branch/dev/install.sh | bash
+curl -fsSL https://gitverse.ru/api/repos/daniel-robotics/lightweight-cobot/raw/branch/master/install.sh | bash
 ```
 
 Скрипт установит ROS 2 Jazzy, Webots, соберёт рабочее пространство и установит CLI `cobot`.

README_en.md

@@ -30,7 +30,7 @@ ROS 2 packages for controlling the **KUKA LBR IIWA 7 R800**: communication with
 Install everything with a single command:
 
 ```bash
-bash <(curl -fsSL https://gitverse.ru/api/repos/daniel-robotics/lightweight-cobot/raw/branch/main/install.sh)
+curl -fsSL https://gitverse.ru/api/repos/daniel-robotics/lightweight-cobot/raw/branch/master/install.sh | bash
 ```
 
 The script installs ROS 2 Jazzy, Webots, builds the workspace, and installs the `cobot` CLI.

doc/lwc-doc/docs/index.md

@@ -1,4 +1,6 @@
-# Welcome to MkDocs выq
+# Welcome to MkDocs 
+
+Тест, того что все работает, и что документация собирается.
 
 For full documentation visit [mkdocs.org](https://www.mkdocs.org).
 

install.sh

@@ -22,6 +22,10 @@ BOLD='\033[1m'
 PYTHON_VERSION="3.11"
 REPO_URL="https://gitverse.ru/daniel-robotics/lightweight-cobot.git"
 
+# Branch to clone. Override via: curl ... | bash -s dev
+# Defaults to master when not specified.
+REPO_BRANCH="${REPO_BRANCH:-${1:-master}}"
+
 # Where to clone the project. Can be overridden by the user with COBOT_INSTALL_DIR.
 # Куда клонировать проект. Пользователь может переопределить через COBOT_INSTALL_DIR.
 INSTALL_DIR="${COBOT_INSTALL_DIR:-$HOME/.lwc}"
@@ -215,8 +219,7 @@ check_python() {
 resolve_install_dir() {
     local script_dir
     script_dir="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" 2>/dev/null && pwd || pwd)"
-    local repo_branch
+    local repo_branch="$REPO_BRANCH"
-    repo_branch="${REPO_BRANCH:-$(git -C "$script_dir" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "master")}"
 
     # Running directly from inside the cloned repo (not via curl|bash)
     if [ -f "$script_dir/setup.py" ] && [ -d "$script_dir/.git" ]; then