Skip to content

Commit 1d5c9bb

Browse files
committed
Merge remote-tracking branch 'origin/main' into xiyu/improve_tasks
2 parents dec22ac + 101e018 commit 1d5c9bb

File tree

125 files changed

+3637
-2188
lines changed

Some content is hidden

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

125 files changed

+3637
-2188
lines changed

.github/workflows/ci_linux.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818
sudo apt-get update
1919
sudo apt-get install libasound2-dev libudev-dev libgtk-3-dev
2020
- uses: actions/checkout@v3
21-
- name: Build rmf_site_format
21+
- name: Test rmf_site_format
2222
run: |
2323
cd crates/rmf_site_format
24-
cargo build
25-
- name: Build rmf_site_editor
26-
run: cargo build --all-targets
27-
- name: Run tests
28-
run: cargo test
24+
cargo test
25+
- name: Test rmf_site_editor
26+
run: |
27+
cd crates/rmf_site_editor
28+
cargo test
2929
3030
build_with_colcon:
3131
runs-on: ubuntu-latest

.github/workflows/ci_windows.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,15 @@ jobs:
2424
rustup target add x86_64-pc-windows-msvc
2525
shell: powershell
2626

27-
- name: build rmf_site_format
27+
- name: Test rmf_site_format
2828
run: |
2929
cd crates/rmf_site_format
30-
cargo build
30+
cargo test
3131
32-
- name: build rmf_site_editor
32+
- name: Test rmf_site_editor
3333
run: |
3434
rustc -Vv
3535
cargo -V
36-
cargo build --all-targets
37-
shell: cmd
38-
39-
- name: test
40-
run: |
4136
cargo test
4237
shell: cmd
38+

.github/workflows/style.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
rustup component add rustfmt
2424
2525
- name: style
26-
run: rustfmt --check --edition 2021 crates/rmf_site_format/src/lib.rs crates/rmf_site_editor/src/lib.rs crates/rmf_site_editor/src/main.rs
26+
run: cargo fmt --check
2727

2828
- name: minimal feature build
2929
run: cd crates/rmf_site_format && cargo check --no-default-features

.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
target
2-
web/librmf_site_editor_web.d.ts
3-
web/librmf_site_editor_web.js
4-
web/librmf_site_editor_web_bg.wasm
5-
web/librmf_site_editor_web_bg_optimized.wasm
6-
web/librmf_site_editor_web_bg.wasm.d.ts
2+
web/rmf_site_editor_web.d.ts
3+
web/rmf_site_editor_web.js
4+
web/rmf_site_editor_web_bg.wasm
5+
web/rmf_site_editor_web_bg_optimized.wasm
6+
web/rmf_site_editor_web_bg.wasm.d.ts
77
/test_output/

0 commit comments

Comments
 (0)