Skip to content

Commit 05ff535

Browse files
authored
Merge branch 'main' into main
2 parents 08e316c + 8e25631 commit 05ff535

File tree

9 files changed

+249
-276
lines changed

9 files changed

+249
-276
lines changed

.github/workflows/all_components.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,18 @@ jobs:
5353
with:
5454
cache-all-crates: "true"
5555
cache-on-failure: "false"
56+
- uses: cargo-bins/cargo-binstall@main
5657
- name: Install CLI
57-
run: cargo install dioxus-cli --git https://github.com/DioxusLabs/dioxus
58+
run: cargo binstall dioxus-cli -y --force --version 0.7.0
5859
- name: Add components and check
5960
run: |
6061
cd test-harness
6162
# Add dependencies manually; TODO: remove this once dx components supports local dependencies
6263
dx components add calendar,popover --path ..
6364
# Add all components
6465
dx components add --all --path .. --force
66+
# Switch to the local version of dioxus-primitives
67+
cargo add dioxus-primitives --path ../primitives
6568
# Make sure it still builds
6669
cargo check --all-features
6770
add-each-component:
@@ -86,8 +89,9 @@ jobs:
8689
with:
8790
cache-all-crates: "true"
8891
cache-on-failure: "false"
92+
- uses: cargo-bins/cargo-binstall@main
8993
- name: Install CLI
90-
run: cargo install dioxus-cli --git https://github.com/DioxusLabs/dioxus
94+
run: cargo binstall dioxus-cli -y --force --version 0.7.0
9195
- name: Add each component and check
9296
run: |
9397
cd preview/src/components/
@@ -105,6 +109,8 @@ jobs:
105109
fi
106110
# Add the component
107111
dx components add "$file" --path ..
112+
# Switch to the local version of dioxus-primitives
113+
cargo add dioxus-primitives --path ../primitives
108114
# Make sure it still builds
109115
cargo check --all-features
110116
# Undo changes

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
cache-on-failure: "false"
3232
- uses: cargo-bins/cargo-binstall@main
3333
- name: Install CLI
34-
run: cargo binstall dioxus-cli -y --force --version 0.7.0-rc.3
34+
run: cargo binstall dioxus-cli -y --force --version 0.7.0
3535
- name: Build
3636
run: cd preview && dx build --web --release --base-path "components"
3737
- name: Copy output

.github/workflows/playwright.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
cache-on-failure: "true"
5757
- uses: cargo-bins/cargo-binstall@main
5858
- name: Install CLI
59-
run: cargo binstall dioxus-cli -y --force --version 0.7.0-rc.3
59+
run: cargo binstall dioxus-cli -y --force --version 0.7.0
6060
- name: Install dependencies
6161
run: cd ./playwright && npm ci
6262
- name: Install Playwright Browsers

.github/workflows/preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
cache-on-failure: "false"
4444
- uses: cargo-bins/cargo-binstall@main
4545
- name: Install CLI
46-
run: cargo binstall dioxus-cli -y --force --version 0.7.0-rc.3
46+
run: cargo binstall dioxus-cli -y --force --version 0.7.0
4747
- name: Build
4848
run: cd preview && dx build --web --release --base-path "components/pr-preview/pr-${{ github.event.pull_request.number }}/"
4949
- name: Copy output

0 commit comments

Comments
 (0)