Skip to content

Commit

Permalink
Bump godot from 301282f to aa7107a (#385)
Browse files Browse the repository at this point in the history
* Bump godot from `301282f` to `aa7107a`

Bumps [godot](https://github.com/godot-rust/gdext) from `301282f` to `aa7107a`.
- [Commits](godot-rust/gdext@301282f...aa7107a)

---
updated-dependencies:
- dependency-name: godot
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix upgrade

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: d10sfan <d10sfan@gmail.com>
  • Loading branch information
dependabot[bot] and d10sfan committed Jul 30, 2024
1 parent bd2a6a0 commit 3d01f02
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
uses: actions/checkout@v4
- name: Install Rust
run: |
rustup toolchain install 1.78.0 --profile minimal --no-self-update
rustup default 1.78.0
rustup toolchain install 1.80.0 --profile minimal --no-self-update
rustup default 1.80.0
shell: bash
- name: Use rust cache
uses: Swatinem/rust-cache@v2
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
uses: actions/checkout@v4
- name: Install Rust
run: |
rustup toolchain install 1.78.0 --profile minimal --no-self-update
rustup default 1.78.0
rustup toolchain install 1.80.0 --profile minimal --no-self-update
rustup default 1.80.0
shell: bash
- name: Use rust cache
uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -50,8 +50,8 @@ jobs:
uses: actions/checkout@v4
- name: Install Rust
run: |
rustup toolchain install 1.78.0 --profile default
rustup default 1.78.0
rustup toolchain install 1.80.0 --profile default
rustup default 1.80.0
- name: Use rust cache
uses: Swatinem/rust-cache@v2
- name: Clippy Run
Expand All @@ -63,8 +63,8 @@ jobs:
uses: actions/checkout@v4
- name: Install Rust
run: |
rustup toolchain install 1.78.0 --profile default
rustup default 1.78.0
rustup toolchain install 1.80.0 --profile default
rustup default 1.80.0
- name: fmt Run
run: cargo fmt --all -- --check
audit:
Expand All @@ -74,8 +74,8 @@ jobs:
uses: actions/checkout@v4
- name: Install Rust
run: |
rustup toolchain install 1.78.0 --profile default
rustup default 1.78.0
rustup toolchain install 1.80.0 --profile default
rustup default 1.80.0
- name: Use rust cache
uses: Swatinem/rust-cache@v2
- name: Audit Run
Expand Down
32 changes: 16 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use std::io::{Error, ErrorKind};
use std::sync::mpsc::channel;
use tokio::runtime::Runtime;

use godot::engine::INode;
use godot::classes::{Node, Os};
use godot::prelude::*;

use crate::command;
Expand Down Expand Up @@ -130,7 +130,7 @@ impl LuxClient {
let env_args: Vec<String> = env::args().collect();
let args: Vec<&str> = env_args.iter().map(|a| a.as_str()).collect();

let running_in_editor = !godot::engine::Os::singleton().has_feature("template".into());
let running_in_editor = !Os::singleton().has_feature("template".into());

match command::main(running_in_editor) {
Ok(()) => {}
Expand Down

0 comments on commit 3d01f02

Please sign in to comment.