From 8ab341f60a5789e8379c03fb8ed58078ab9cc997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=B8=D0=BB=20=D0=93=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=B0=D1=80=D1=8C?= Date: Tue, 16 Jun 2026 13:18:49 +1000 Subject: [PATCH 1/9] Change pulling dev to master --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 4a96dac..cfa0ff2 100644 --- a/install.sh +++ b/install.sh @@ -245,7 +245,7 @@ resolve_install_dir() { local attempt=1 while [ $attempt -le 5 ]; do # TODO: Изменить на --depth 1 --branch main после слияния dev в main. - if git clone --depth 1 --branch dev "$REPO_URL" "$INSTALL_DIR" Date: Thu, 18 Jun 2026 06:01:48 +0300 Subject: [PATCH 2/9] feat: add GitHub Actions workflows for documentation deployment and building --- .github/workflows/docs.yml | 43 ++++++++++++++++++++++++++++++++++++ .gitverse/workflows/docs.yml | 40 +++++++++++++++++++++++++++++++++ doc/lwc-doc/mkdocs.yml | 1 + 3 files changed, 84 insertions(+) create mode 100644 .github/workflows/docs.yml create mode 100644 .gitverse/workflows/docs.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml new file mode 100644 index 0000000..518be92 --- /dev/null +++ b/.github/workflows/docs.yml @@ -0,0 +1,43 @@ +name: Документация + +on: + push: + branches: + - master + +permissions: + contents: write + +jobs: + deploy-docs: + 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 + with: + python-version: '3.12' + + - name: Install system dependencies (WeasyPrint/PDF) + run: | + sudo apt-get update -qq + sudo apt-get install -y \ + libcairo2 libpango-1.0-0 libpangoft2-1.0-0 \ + libgdk-pixbuf-2.0-0 libffi-dev \ + fontconfig fonts-dejavu + + - name: Install MkDocs + run: pip install mkdocs-material mkdocs-with-pdf + + - name: Configure Git + run: | + 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 diff --git a/.gitverse/workflows/docs.yml b/.gitverse/workflows/docs.yml new file mode 100644 index 0000000..40dcea4 --- /dev/null +++ b/.gitverse/workflows/docs.yml @@ -0,0 +1,40 @@ +name: Документация + +on: + push: + branches: + - master + +jobs: + build-docs: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: '3.12' + + - name: Install system dependencies (WeasyPrint/PDF) + run: | + sudo apt-get update -qq + sudo apt-get install -y \ + libcairo2 libpango-1.0-0 libpangoft2-1.0-0 \ + libgdk-pixbuf-2.0-0 libffi-dev \ + fontconfig fonts-dejavu + + - name: Install MkDocs + run: pip install mkdocs-material mkdocs-with-pdf + + - name: Build Documentation + run: mkdocs build + working-directory: doc/lwc-doc + + - name: Upload site as artifact + uses: actions/upload-artifact@v4 + with: + name: documentation-site + path: doc/lwc-doc/site/ + retention-days: 30 diff --git a/doc/lwc-doc/mkdocs.yml b/doc/lwc-doc/mkdocs.yml index aede180..6f05cf0 100644 --- a/doc/lwc-doc/mkdocs.yml +++ b/doc/lwc-doc/mkdocs.yml @@ -1,4 +1,5 @@ site_name: Документация LWC +site_url: https://daniel-robotic.github.io/lightweight-cobot/ site_description: Документация по использованию коллаборативного робота KUKA LBR iiwa 7 и его программированию в среде ROS 2. site_author: Даниил Грабарь From a172ffe038604270548fd6d575edb76412b0f74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=B8=D0=BB=20=D0=93=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=B0=D1=80=D1=8C?= Date: Thu, 18 Jun 2026 06:15:55 +0300 Subject: [PATCH 3/9] fix: update installation scripts to use the correct branch for cloning and installation --- README.md | 2 +- install.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 40775a2..2bbf9f7 100644 --- a/README.md +++ b/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/main/install.sh +curl -fsSL https://gitverse.ru/api/repos/daniel-robotics/lightweight-cobot/raw/branch/dev/install.sh | bash ``` Скрипт установит ROS 2 Jazzy, Webots, соберёт рабочее пространство и установит CLI `cobot`. diff --git a/install.sh b/install.sh index cfa0ff2..4a1845c 100644 --- a/install.sh +++ b/install.sh @@ -215,6 +215,8 @@ check_python() { resolve_install_dir() { local script_dir script_dir="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" 2>/dev/null && pwd || pwd)" + local 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 @@ -226,7 +228,7 @@ resolve_install_dir() { # Repo already cloned — pull instead of re-clone if [ -d "$INSTALL_DIR/.git" ]; then log_info "Repo already exists at $INSTALL_DIR — pulling latest..." - git -C "$INSTALL_DIR" pull --ff-only origin dev Date: Thu, 18 Jun 2026 06:17:01 +0300 Subject: [PATCH 4/9] fix: update installation script URL to use the master branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2bbf9f7..660395c 100644 --- a/README.md +++ b/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`. From 985425b866308edc6a9b6d3cad22ea1d738eb251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=B8=D0=BB=20=D0=93=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=B0=D1=80=D1=8C?= Date: Thu, 18 Jun 2026 06:37:53 +0300 Subject: [PATCH 5/9] refactor: update GitHub Actions workflow for documentation build and deployment --- .github/workflows/docs.yml | 41 ++++++++++++++++++++++++------------ .gitverse/workflows/docs.yml | 40 ----------------------------------- doc/lwc-doc/docs/index.md | 4 +++- 3 files changed, 31 insertions(+), 54 deletions(-) delete mode 100644 .gitverse/workflows/docs.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 518be92..a1ecbef 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -6,19 +6,23 @@ 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 + uses: actions/checkout@v5 - name: Setup Python 3.12 - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: '3.12' @@ -33,11 +37,22 @@ jobs: - name: Install MkDocs run: pip install mkdocs-material mkdocs-with-pdf - - name: Configure Git - run: | - 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 + - name: Build Documentation + run: mkdocs build working-directory: doc/lwc-doc + + - name: Upload Pages artifact + uses: actions/upload-pages-artifact@v3 + with: + path: doc/lwc-doc/site/ + + deploy: + needs: build + runs-on: ubuntu-latest + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + steps: + - name: Deploy to Pages + id: deployment + uses: actions/deploy-pages@v4 diff --git a/.gitverse/workflows/docs.yml b/.gitverse/workflows/docs.yml deleted file mode 100644 index 40dcea4..0000000 --- a/.gitverse/workflows/docs.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Документация - -on: - push: - branches: - - master - -jobs: - build-docs: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup Python 3.12 - uses: actions/setup-python@v5 - with: - python-version: '3.12' - - - name: Install system dependencies (WeasyPrint/PDF) - run: | - sudo apt-get update -qq - sudo apt-get install -y \ - libcairo2 libpango-1.0-0 libpangoft2-1.0-0 \ - libgdk-pixbuf-2.0-0 libffi-dev \ - fontconfig fonts-dejavu - - - name: Install MkDocs - run: pip install mkdocs-material mkdocs-with-pdf - - - name: Build Documentation - run: mkdocs build - working-directory: doc/lwc-doc - - - name: Upload site as artifact - uses: actions/upload-artifact@v4 - with: - name: documentation-site - path: doc/lwc-doc/site/ - retention-days: 30 diff --git a/doc/lwc-doc/docs/index.md b/doc/lwc-doc/docs/index.md index 8dcb47d..fdd55ae 100644 --- a/doc/lwc-doc/docs/index.md +++ b/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). From 16cb4dc6e7eeaf9df810770b7598801c7ffaf7e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=B8=D0=BB=20=D0=93=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=B0=D1=80=D1=8C?= Date: Thu, 18 Jun 2026 06:59:41 +0300 Subject: [PATCH 6/9] fix: update GitHub Actions workflow to handle uploads for both GitHub and GitVerse --- .github/workflows/docs.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a1ecbef..0d0f9ee 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -41,18 +41,28 @@ jobs: run: mkdocs build working-directory: doc/lwc-doc - - name: Upload Pages artifact + - name: Upload Pages artifact (GitHub) + if: github.server_url == 'https://github.com' uses: actions/upload-pages-artifact@v3 with: path: doc/lwc-doc/site/ + - name: Upload Pages artifact (GitVerse) + if: github.server_url != 'https://github.com' + uses: gitverse/upload-pages-artifact@v1.0.0 + with: + path: doc/lwc-doc/site/ + deploy: needs: build runs-on: ubuntu-latest environment: name: github-pages - url: ${{ steps.deployment.outputs.page_url }} steps: - - name: Deploy to Pages - id: deployment + - name: Deploy to GitHub Pages + if: github.server_url == 'https://github.com' uses: actions/deploy-pages@v4 + + - name: Deploy to GitVerse Pages + if: github.server_url != 'https://github.com' + uses: gitverse/deploy-pages@v1.0.0 From de0117af94e136e179f3121d543227deab4a1078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=B8=D0=BB=20=D0=93=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=B0=D1=80=D1=8C?= Date: Thu, 18 Jun 2026 07:05:04 +0300 Subject: [PATCH 7/9] feat: add GitVerse workflow for documentation build and deployment --- .github/workflows/docs.yml | 14 +---------- .gitverse/workflows/docs.yml | 45 ++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 .gitverse/workflows/docs.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0d0f9ee..de01235 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -41,18 +41,11 @@ jobs: run: mkdocs build working-directory: doc/lwc-doc - - name: Upload Pages artifact (GitHub) - if: github.server_url == 'https://github.com' + - name: Upload Pages artifact uses: actions/upload-pages-artifact@v3 with: path: doc/lwc-doc/site/ - - name: Upload Pages artifact (GitVerse) - if: github.server_url != 'https://github.com' - uses: gitverse/upload-pages-artifact@v1.0.0 - with: - path: doc/lwc-doc/site/ - deploy: needs: build runs-on: ubuntu-latest @@ -60,9 +53,4 @@ jobs: name: github-pages steps: - name: Deploy to GitHub Pages - if: github.server_url == 'https://github.com' uses: actions/deploy-pages@v4 - - - name: Deploy to GitVerse Pages - if: github.server_url != 'https://github.com' - uses: gitverse/deploy-pages@v1.0.0 diff --git a/.gitverse/workflows/docs.yml b/.gitverse/workflows/docs.yml new file mode 100644 index 0000000..dde8c96 --- /dev/null +++ b/.gitverse/workflows/docs.yml @@ -0,0 +1,45 @@ +name: Документация + +on: + push: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: '3.12' + + - name: Install system dependencies (WeasyPrint/PDF) + run: | + sudo apt-get update -qq + sudo apt-get install -y \ + libcairo2 libpango-1.0-0 libpangoft2-1.0-0 \ + libgdk-pixbuf-2.0-0 libffi-dev \ + fontconfig fonts-dejavu + + - name: Install MkDocs + run: pip install mkdocs-material mkdocs-with-pdf + + - name: Build Documentation + run: mkdocs build + working-directory: doc/lwc-doc + + - name: Upload Pages artifact + uses: gitverse/upload-pages-artifact@v1.0.0 + with: + path: doc/lwc-doc/site/ + + deploy: + needs: build + runs-on: ubuntu-latest + steps: + - name: Deploy to GitVerse Pages + uses: gitverse/deploy-pages@v1.0.0 From ec4e1d87ad7fe2b2e75a723a748df5ae83be9596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=B8=D0=BB=20=D0=93=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=B0=D1=80=D1=8C?= Date: Thu, 18 Jun 2026 07:16:40 +0300 Subject: [PATCH 8/9] fix: update documentation workflows for GitHub and GitVerse compatibility --- .github/workflows/docs.yml | 17 ++++++++++---- .gitverse/workflows/docs.yml | 45 ------------------------------------ 2 files changed, 13 insertions(+), 49 deletions(-) delete mode 100644 .gitverse/workflows/docs.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index de01235..79782ff 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -19,10 +19,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v4 - name: Setup Python 3.12 - uses: actions/setup-python@v6 + uses: actions/setup-python@v5 with: python-version: '3.12' @@ -42,11 +42,12 @@ jobs: working-directory: doc/lwc-doc - name: Upload Pages artifact - uses: actions/upload-pages-artifact@v3 + uses: actions/upload-pages-artifact@v1.0.0 with: path: doc/lwc-doc/site/ - deploy: + deploy-github: + if: github.server_url == 'https://github.com' needs: build runs-on: ubuntu-latest environment: @@ -54,3 +55,11 @@ jobs: 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 diff --git a/.gitverse/workflows/docs.yml b/.gitverse/workflows/docs.yml deleted file mode 100644 index dde8c96..0000000 --- a/.gitverse/workflows/docs.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Документация - -on: - push: - branches: - - master - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup Python 3.12 - uses: actions/setup-python@v5 - with: - python-version: '3.12' - - - name: Install system dependencies (WeasyPrint/PDF) - run: | - sudo apt-get update -qq - sudo apt-get install -y \ - libcairo2 libpango-1.0-0 libpangoft2-1.0-0 \ - libgdk-pixbuf-2.0-0 libffi-dev \ - fontconfig fonts-dejavu - - - name: Install MkDocs - run: pip install mkdocs-material mkdocs-with-pdf - - - name: Build Documentation - run: mkdocs build - working-directory: doc/lwc-doc - - - name: Upload Pages artifact - uses: gitverse/upload-pages-artifact@v1.0.0 - with: - path: doc/lwc-doc/site/ - - deploy: - needs: build - runs-on: ubuntu-latest - steps: - - name: Deploy to GitVerse Pages - uses: gitverse/deploy-pages@v1.0.0 From dca056064a57259eda920cc218a0216d80016cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=B8=D0=BB=20=D0=93=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=B0=D1=80=D1=8C?= Date: Thu, 18 Jun 2026 11:15:10 +0300 Subject: [PATCH 9/9] fix: update installation script to use master branch for cloning --- README_en.md | 2 +- install.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README_en.md b/README_en.md index b21140d..32e7d6c 100644 --- a/README_en.md +++ b/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. diff --git a/install.sh b/install.sh index 4a1845c..8be0fba 100644 --- a/install.sh +++ b/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 - repo_branch="${REPO_BRANCH:-$(git -C "$script_dir" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "master")}" + local repo_branch="$REPO_BRANCH" # Running directly from inside the cloned repo (not via curl|bash) if [ -f "$script_dir/setup.py" ] && [ -d "$script_dir/.git" ]; then