From 42edd698580e01a725cc7a4aa5efb3de0cf694d2 Mon Sep 17 00:00:00 2001 From: kp2pml30 Date: Fri, 18 Jul 2025 22:30:48 +0900 Subject: [PATCH 1/2] fix: docs pipeline (4) --- .github/workflows/deploy-docs.yml | 29 ++++++++++++++------ build-scripts/devenv/flake.nix | 21 -------------- build-scripts/ya-build-plugins/src/webget.rb | 2 +- 3 files changed, 21 insertions(+), 31 deletions(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 2903e409..95c725cc 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -37,10 +37,13 @@ jobs: lfs: true ref: ${{ inputs.revision || github.ref }} - - uses: cachix/install-nix-action@v30 + - uses: Gr1N/setup-poetry@v9 + + - name: Setup Python + uses: actions/setup-python@v5 with: - github_access_token: ${{ secrets.GITHUB_TOKEN }} - install_url: https://releases.nixos.org/nix/nix-2.24.11/install + python-version: '3.12' + cache: poetry - name: Get source uses: ./.github/actions/get-src @@ -48,15 +51,23 @@ jobs: load_submodules: "true" third_party: "none" - - name: Build + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '18' + + - name: Install dependencies run: | - nix develop ./build-scripts/devenv#docs --command bash -c ' + npm install -g @mermaid-js/mermaid-cli@11.6.0 && \ + python3.12 -m pip install poetry && \ pushd doc/website/ && \ poetry install --no-root && \ - popd && \ - ruby ./tools/ya-build/ya-build config && \ - ninja -v -C build genvm/docs - ' + popd + + - name: Build + run: | + ./tools/ya-build/ya-build config + ninja -v -C build genvm/docs - name: Checkout target repository uses: actions/checkout@v4 diff --git a/build-scripts/devenv/flake.nix b/build-scripts/devenv/flake.nix index bd171827..90dba625 100644 --- a/build-scripts/devenv/flake.nix +++ b/build-scripts/devenv/flake.nix @@ -55,27 +55,6 @@ export LD_LIBRARY_PATH="${toString pkgs.xz.out}/lib:${toString pkgs.zlib.out}/lib:${toString pkgs.stdenv.cc.cc.lib}/lib:${toString pkgs.glibc}/lib:$LD_LIBRARY_PATH" ''; }; - - devShells.docs = pkgs.mkShell { - packages = with pkgs; [ - python312 - poetry - - ninja - ruby - - xz - zlib - glibc - - mermaid-cli - ]; - - shellHook = '' - export PATH="$(pwd)/tools/ya-build:$(pwd)/tools/git-third-party:$PATH" - export LD_LIBRARY_PATH="${toString pkgs.xz.out}/lib:${toString pkgs.zlib.out}/lib:${toString pkgs.glibc}/lib:$LD_LIBRARY_PATH" - ''; - }; } ); } diff --git a/build-scripts/ya-build-plugins/src/webget.rb b/build-scripts/ya-build-plugins/src/webget.rb index 87869fa3..b35f849f 100644 --- a/build-scripts/ya-build-plugins/src/webget.rb +++ b/build-scripts/ya-build-plugins/src/webget.rb @@ -35,7 +35,7 @@ def extract_tar(base_dir, path, trim_first: true) if path.to_s.end_with?('.xz') require 'rubygems/package' begin - Gem::Specification::find_by_name('ruby-xz') + Gem::Specification::find_by_name('ruby-xz', '1.0.3') rescue Gem::LoadError require 'rubygems/commands/install_command' cmd = Gem::Commands::InstallCommand.new From 661ebbf5b16cb9a7172a8015a427908b2a809c5c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Jul 2025 15:37:46 +0000 Subject: [PATCH 2/2] chore(deps): update dependency node to v22 --- .github/workflows/deploy-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 95c725cc..f073e394 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -54,7 +54,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '22' - name: Install dependencies run: |