Skip to content

Commit a1f6bfb

Browse files
committed
Merge remote-tracking branch 'origin/main' into docsrs-search
2 parents a637ea4 + 981ff80 commit a1f6bfb

247 files changed

Lines changed: 6841 additions & 3567 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/check.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,21 @@ concurrency:
3232

3333
jobs:
3434
check:
35-
runs-on: blacksmith-4vcpu-ubuntu-2404
35+
runs-on: warp-ubuntu-latest-x64-4x
3636
steps:
3737
- uses: awalsh128/cache-apt-pkgs-action@latest
3838
with:
3939
packages: libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev libxdo-dev
4040
version: 1.0
4141
- uses: actions/checkout@v4
42+
with:
43+
submodules: "recursive"
4244
- uses: dtolnay/rust-toolchain@stable
4345
- uses: Swatinem/rust-cache@v2
4446
with:
4547
cache-all-crates: "true"
4648
cache-on-failure: "false"
4749
cache-directories: "target/dx"
50+
cache-provider: "warpbuild"
4851
- name: Check
4952
run: cargo check --workspace --all-features

.github/workflows/fly-deploy.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ concurrency:
1414
jobs:
1515
deploy:
1616
name: Deploy app
17-
runs-on: blacksmith-4vcpu-ubuntu-2404
17+
runs-on: warp-ubuntu-latest-x64-4x
1818
concurrency: deploy-group # optional: ensure only one action runs at a time
1919
steps:
2020
- uses: actions/checkout@v4
21+
with:
22+
submodules: "recursive"
2123
- uses: superfly/flyctl-actions/setup-flyctl@master
2224
- run: flyctl deploy --remote-only
2325
env:

.github/workflows/gh-pages.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ concurrency:
1111

1212
jobs:
1313
build-deploy:
14-
runs-on: blacksmith-4vcpu-ubuntu-2404
14+
runs-on: warp-ubuntu-latest-x64-8x
1515
env:
1616
CARGO_INCREMENTAL: 1
1717
steps:
1818
- uses: actions/checkout@v4
19+
with:
20+
submodules: "recursive"
1921
- uses: awalsh128/cache-apt-pkgs-action@latest
2022
with:
2123
packages: libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev libxdo-dev
@@ -29,13 +31,14 @@ jobs:
2931
with:
3032
cache-all-crates: "true"
3133
cache-on-failure: "false"
34+
cache-provider: "warpbuild"
3235
- uses: cargo-bins/cargo-binstall@main
3336
- name: Install CLI
34-
run: cargo binstall dioxus-cli -y --force --version 0.7.0-alpha.3
37+
run: cargo binstall dioxus-cli -y --force
3538
- name: Build
36-
run: cd packages/docsite && dx build --verbose --trace --web --fullstack --features fullstack,production --release --ssg
39+
run: cd packages/docsite && dx build --verbose --trace --web --fullstack true --features fullstack,production --release --ssg
3740
- name: Generate search index
38-
run: target/dx/dioxus_docs_site/release/web/dioxus_docs_site --generate-search-index
41+
run: target/dx/dioxus_docs_site/release/web/server --generate-search-index
3942
- name: Copy output
4043
run: cp -r target/dx/dioxus_docs_site/release/web/public docs
4144
- name: Add gh pages 404

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/.dioxus
1010
/target
1111
.DS_Store
12+
._*
1213

1314
.vscode/*
1415
!.vscode/settings.json

.gitmodules

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[submodule "packages/include_mdbook/packages/mdbook-gen/sublime_toml_highlighting"]
2+
path = packages/include_mdbook/packages/mdbook-gen/sublime_toml_highlighting
3+
url = https://github.com/jasonwilliams/sublime_toml_highlighting
4+
[submodule "packages/include_mdbook/packages/mdbook-gen/Packages"]
5+
path = packages/include_mdbook/packages/mdbook-gen/Packages
6+
url = https://github.com/sublimehq/Packages.git
7+
[submodule "packages/include_mdbook/packages/mdbook-gen/rust-enhanced"]
8+
path = packages/include_mdbook/packages/mdbook-gen/rust-enhanced
9+
url = https://github.com/rust-lang/rust-enhanced

0 commit comments

Comments
 (0)