Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update rs version to 1.77 and update rust github actions. #17

Merged
merged 1 commit into from
Apr 1, 2024
Merged

Update rs version to 1.77 and update rust github actions. #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
update rs version to 1.77 and update rust github actions.
  • Loading branch information
@youyuanwu
youyuanwu committed Apr 1, 2024
commit d6ebf569782b46b7e8d5db01348ffc343cad7e74
50 changes: 15 additions & 35 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,19 @@ jobs:
uses: lukka/[email protected]

- name: Install rust stable
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
toolchain: 1.77.0
components: rustfmt, clippy

- name: Run cargo check
uses: actions-rs/cargo@v1
with:
command: check
run: cargo check

- name: Run cargo fmt
uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
run: cargo fmt --all -- --check

- name: Run cargo clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: -- -D warnings
run: cargo clippy -- -D warnings

- name: run cmake
run: >
Expand Down Expand Up @@ -66,10 +59,7 @@ jobs:
run: Powershell.exe -File .\tests\echo_script_test.ps1

- name: Run cargo test
uses: actions-rs/cargo@v1
with:
command: test
args: --all -- --nocapture
run: cargo test --all -- --nocapture

build-linux:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -99,26 +89,19 @@ jobs:
uses: lukka/[email protected]

- name: Install rust stable
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable

toolchain: 1.77.0
components: rustfmt, clippy

- name: Run cargo check
uses: actions-rs/cargo@v1
with:
command: check
run: cargo check

- name: Run cargo fmt
uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
run: cargo fmt --all -- --check

- name: Run cargo clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: -- -D warnings
run: cargo clippy -- -D warnings

- name: run cmake
run: >
Expand Down Expand Up @@ -169,7 +152,4 @@ jobs:
# sfctl service resolve --service-id EchoApp/EchoAppService

- name: Run cargo test
uses: actions-rs/cargo@v1
with:
command: test
args: --all -- --nocapture
run: cargo test --all -- --nocapture
2 changes: 1 addition & 1 deletion crates/tools/fabric-gen/src/gen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ pub mod code {
stream
}

fn gen_return_type(&self, params: &Vec<ParamEntry>) -> TokenStream {
fn gen_return_type(&self, params: &[ParamEntry]) -> TokenStream {
if params.is_empty() {
quote! {
crate::sync::FabricReceiver<::windows_core::Result<()>>
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# cargo + rustup will use this to consistently build the project
# with the same version across all checkouts and environments
[toolchain]
channel = "1.75.0"
channel = "1.77.0"
profile = "default"
Loading