Skip to content

Commit 42edd69

Browse files
committed
fix: docs pipeline (4)
1 parent 23c29b1 commit 42edd69

File tree

3 files changed

+21
-31
lines changed

3 files changed

+21
-31
lines changed

.github/workflows/deploy-docs.yml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,37 @@ jobs:
3737
lfs: true
3838
ref: ${{ inputs.revision || github.ref }}
3939

40-
- uses: cachix/install-nix-action@v30
40+
- uses: Gr1N/setup-poetry@v9
41+
42+
- name: Setup Python
43+
uses: actions/setup-python@v5
4144
with:
42-
github_access_token: ${{ secrets.GITHUB_TOKEN }}
43-
install_url: https://releases.nixos.org/nix/nix-2.24.11/install
45+
python-version: '3.12'
46+
cache: poetry
4447

4548
- name: Get source
4649
uses: ./.github/actions/get-src
4750
with:
4851
load_submodules: "true"
4952
third_party: "none"
5053

51-
- name: Build
54+
- name: Setup Node.js
55+
uses: actions/setup-node@v4
56+
with:
57+
node-version: '18'
58+
59+
- name: Install dependencies
5260
run: |
53-
nix develop ./build-scripts/devenv#docs --command bash -c '
61+
npm install -g @mermaid-js/mermaid-cli@11.6.0 && \
62+
python3.12 -m pip install poetry && \
5463
pushd doc/website/ && \
5564
poetry install --no-root && \
56-
popd && \
57-
ruby ./tools/ya-build/ya-build config && \
58-
ninja -v -C build genvm/docs
59-
'
65+
popd
66+
67+
- name: Build
68+
run: |
69+
./tools/ya-build/ya-build config
70+
ninja -v -C build genvm/docs
6071
6172
- name: Checkout target repository
6273
uses: actions/checkout@v4

build-scripts/devenv/flake.nix

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,27 +55,6 @@
5555
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"
5656
'';
5757
};
58-
59-
devShells.docs = pkgs.mkShell {
60-
packages = with pkgs; [
61-
python312
62-
poetry
63-
64-
ninja
65-
ruby
66-
67-
xz
68-
zlib
69-
glibc
70-
71-
mermaid-cli
72-
];
73-
74-
shellHook = ''
75-
export PATH="$(pwd)/tools/ya-build:$(pwd)/tools/git-third-party:$PATH"
76-
export LD_LIBRARY_PATH="${toString pkgs.xz.out}/lib:${toString pkgs.zlib.out}/lib:${toString pkgs.glibc}/lib:$LD_LIBRARY_PATH"
77-
'';
78-
};
7958
}
8059
);
8160
}

build-scripts/ya-build-plugins/src/webget.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def extract_tar(base_dir, path, trim_first: true)
3535
if path.to_s.end_with?('.xz')
3636
require 'rubygems/package'
3737
begin
38-
Gem::Specification::find_by_name('ruby-xz')
38+
Gem::Specification::find_by_name('ruby-xz', '1.0.3')
3939
rescue Gem::LoadError
4040
require 'rubygems/commands/install_command'
4141
cmd = Gem::Commands::InstallCommand.new

0 commit comments

Comments
 (0)