Skip to content

Commit 0d33c40

Browse files
committed
Merge branch 'main' into rewrite-dx-init-new
2 parents 65bed0d + 9f22e90 commit 0d33c40

File tree

413 files changed

+11776
-15224
lines changed

Some content is hidden

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

413 files changed

+11776
-15224
lines changed

.cargo/config.toml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
# All of these variables are used in the `openid_connect_demo` example, they are set here for the CI to work, they are set here because as stated here for now: `https://doc.rust-lang.org/cargo/reference/config.html` the .cargo/config.toml of the inner workspaces are not read when being invoked from the root workspace.
2-
[env]
3-
DIOXUS_FRONT_ISSUER_URL = ""
4-
DIOXUS_FRONT_CLIENT_ID = ""
5-
DIOXUS_FRONT_URL = ""
1+
[profile]
2+
3+
[profile.dioxus-client]
4+
inherits = "dev"
5+
opt-level = 2
6+
7+
[profile.dioxus-server]
8+
inherits = "dev"
9+
opt-level = 2

.github/workflows/merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
run: cargo doc --no-deps --workspace --all-features
5454

5555
- name: Deploy
56-
uses: JamesIves/[email protected].3
56+
uses: JamesIves/[email protected].4
5757
with:
5858
branch: gh-pages
5959
folder: target/doc

.github/workflows/nix.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "Nix CI"
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- packages/**
9+
- examples/**
10+
- docs/guide/**
11+
- src/**
12+
- .github/**
13+
- lib.rs
14+
- Cargo.toml
15+
- Makefile.toml
16+
17+
pull_request:
18+
types: [opened, synchronize, reopened, ready_for_review]
19+
branches:
20+
- main
21+
paths:
22+
- packages/**
23+
- examples/**
24+
- src/**
25+
- .github/**
26+
- lib.rs
27+
- Cargo.toml
28+
jobs:
29+
build:
30+
runs-on: ${{ matrix.os }}
31+
strategy:
32+
matrix:
33+
os: [ubuntu-latest, macos-latest]
34+
steps:
35+
- uses: actions/checkout@v4
36+
- uses: DeterminateSystems/nix-installer-action@main
37+
- uses: DeterminateSystems/magic-nix-cache-action@main
38+
- name: Install omnix
39+
run: nix --accept-flake-config profile install "github:juspay/omnix"
40+
- name: Build all flake outputs
41+
run: om ci
42+
- name: Ensure devShell has all build deps
43+
run: nix develop -c cargo build -p dioxus-cli

.vscode/settings.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
"editor.formatOnSave": false
55
},
66
// "rust-analyzer.check.workspace": true,
7-
"rust-analyzer.check.workspace": false,
8-
"rust-analyzer.check.features": "all",
7+
// "rust-analyzer.check.workspace": false,
8+
// "rust-analyzer.check.features": "all",
99
"rust-analyzer.cargo.features": "all",
10-
"rust-analyzer.check.allTargets": true,
10+
"rust-analyzer.check.features": "all",
11+
// "rust-analyzer.check.allTargets": true,
1112
// we don't want the formatter to kick in while we're working on dioxus itself
1213
"dioxus.formatOnSave": "disabled",
1314
}

0 commit comments

Comments
 (0)