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 server CI, dependencies and change to Rust 2024 edition #256

Merged
merged 93 commits into from
Dec 1, 2024
Merged

Update server CI, dependencies and change to Rust 2024 edition #256

merged 93 commits into from
Dec 1, 2024

Conversation

larziwau
Copy link
Contributor

Well Ive also switched to a new rust gh action bc the old one was unmaintained

larziwau and others added 30 commits November 28, 2024 13:14
@larziwau
Reformat
5af81a0
@larziwau
Update server CI
155bc30
@larziwau
Remove since not needed (gives error if exists)
c5a7c89
@larziwau
Remove unused import
b87d4a8
@larziwau
Remove
5f889fa
@larziwau
WIP
9cf7c92
@larziwau
Done
c6318f2
@dependabot
Update async-watcher requirement from 0.2.1 to 0.3.0 in /server
a8ac179 
Updates the requirements on [async-watcher](https://github.com/justinrubek/async-watcher) to permit the latest version.
- [Release notes](https://github.com/justinrubek/async-watcher/releases)
- [Changelog](https://github.com/justinrubek/async-watcher/blob/main/CHANGELOG.md)
- [Commits](justinrubek/async-watcher@0.2.1...0.3.0)

---
updated-dependencies:
- dependency-name: async-watcher
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Update console-subscriber requirement in /server/game
27f4adb 
Updates the requirements on [console-subscriber](https://github.com/tokio-rs/console) to permit the latest version.
- [Release notes](https://github.com/tokio-rs/console/releases)
- [Changelog](https://github.com/tokio-rs/console/blob/main/release-plz.toml)
- [Commits](tokio-rs/console@console-subscriber-v0.2.0...console-subscriber-v0.4.1)

---
updated-dependencies:
- dependency-name: console-subscriber
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Update rustc-hash requirement from 1.1.0 to 2.0.0 in /server
837206a 
Updates the requirements on [rustc-hash](https://github.com/rust-lang/rustc-hash) to permit the latest version.
- [Changelog](https://github.com/rust-lang/rustc-hash/blob/master/CHANGELOG.md)
- [Commits](rust-lang/rustc-hash@v1.2.0...v2.0.0)

---
updated-dependencies:
- dependency-name: rustc-hash
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Update rocket_db_pools requirement from 0.1.0 to 0.2.0 in /server
198a546 
Updates the requirements on [rocket_db_pools](https://github.com/rwf2/Rocket) to permit the latest version.
- [Release notes](https://github.com/rwf2/Rocket/releases)
- [Changelog](https://github.com/rwf2/Rocket/blob/master/CHANGELOG.md)
- [Commits](rwf2/Rocket@v0.1.0...v0.2.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Update egui requirement from 0.27.2 to 0.29.1 in /server/observer
ec16470 
Updates the requirements on [egui](https://github.com/emilk/egui) to permit the latest version.
- [Release notes](https://github.com/emilk/egui/releases)
- [Changelog](https://github.com/emilk/egui/blob/master/CHANGELOG.md)
- [Commits](emilk/egui@0.27.2...0.29.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Update base64 requirement from 0.21.7 to 0.22.1 in /server/shared
625e006 
Updates the requirements on [base64](https://github.com/marshallpierce/rust-base64) to permit the latest version.
- [Changelog](https://github.com/marshallpierce/rust-base64/blob/master/RELEASE-NOTES.md)
- [Commits](marshallpierce/rust-base64@v0.21.7...v0.22.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
@larziwau
Merge pull request #13 from larziwau/dependabot/cargo/server/shared/b…
6834dfa 
…ase64-0.22.1
@larziwau
Merge pull request #12 from larziwau/dependabot/cargo/server/observer…
7215c31 
…/egui-0.29.1
@larziwau
Merge pull request #11 from larziwau/dependabot/cargo/server/rocket_d…
6db760c 
…b_pools-0.2.0
@larziwau
Merge pull request #10 from larziwau/dependabot/cargo/server/rustc-ha…
4d8dd54 
…sh-2.0.0
@larziwau
Update Cargo.toml
c556b8e
@larziwau
Update CMakeLists
01603e1
@larziwau
oops
ad0e245
@larziwau
Merge pull request #9 from larziwau/dependabot/cargo/server/game/cons…
90dac77 
…ole-subscriber-0.4.1
@larziwau
Merge pull request #8 from larziwau/dependabot/cargo/server/async-wat…
5b743df 
…cher-0.3.0
@larziwau
fix?
2149619
@larziwau
Update libs
86825ab
@larziwau
update
a6da229
@larziwau
Update Cargo.toml
5889a36
@larziwau
Update Cargo.toml
118c475
@larziwau
Update Cargo.toml
bc67734
@larziwau
Update Cargo.toml
5a65247
@larziwau
Update Cargo.toml
264cdcd
@larziwau
Copy link
Contributor Author

i appreciate the effort but you didn't have to bump edition to 2024 and bump all dependencies, i can see you slowly trying to fix everything through action builds but it'll be simpler if i did that myself locally 😭

some of the attempts to fix warnings/errors aren't done correctly and will lead to issues as well

ur so right lol, im looking at the all of the actions to fix them manually, also updated the deps to make them more futureproof lol, a help would be great tho

@dankmeme01
Copy link
Collaborator

well first of all, all functions that already were marked unsafe, should stay unsafe, unsafe exists as a hint to the programmer that they should be careful using the function. removing the unsafe marker can lead to somebody making wrong assumptions and using the functions in a dangerous way.

sqlx features were changed from ["migrate"] to ["runtime-tokio-native-tls"], but a. we use rustls, b. migrate feature is necessary, so it should be ["migrate", "runtime-tokio-rustls"]

i might have fixed something else, but all other changes look fine so far

@larziwau
Copy link
Contributor Author

okay, can u do necessary fixing tho?

@dankmeme01
Copy link
Collaborator

alright

@dankmeme01 dankmeme01 changed the title Update server CI Update server CI, dependencies and change to Rust 2024 edition Dec 1, 2024
@dankmeme01 dankmeme01 merged commit 5d25494 into GlobedGD:main Dec 1, 2024
5 checks passed
@larziwau
Copy link
Contributor Author

larziwau commented Dec 1, 2024

@dankmeme01 also btw hear me out and NEVER UPDATE sqlx at what cost. it errors about sql3. it took me 30 mins to to figure out i have to downgrade that.

@larziwau
Copy link
Contributor Author

larziwau commented Dec 1, 2024

also i think we should set up a linter (sorry but ur formatting sucks 😭 )

@dankmeme01
Copy link
Collaborator

@dankmeme01 also btw hear me out and NEVER UPDATE sqlx at what cost. it errors about sql3. it took me 30 mins to to figure out i have to downgrade that.

oh yeah i've ran into that as well, it seems that rocket_db_pools depends strictly on sqlx ^0.7.0 and if we update our sqlx to 0.8.x they enter a conflict. not really sure what we can do until rocket updates their dependency

also i think we should set up a linter (sorry but ur formatting sucks 😭 )

aw :( is it about client or server? server uses rustfmt which i sometimes kinda dislike but it's been mostly fine for me, and for client i don't really want to use clang-format, i like my own code style

@larziwau
Copy link
Contributor Author

larziwau commented Dec 2, 2024

well yeah but both the mod itself and server formatting is a bit bad. i will try to figure linter thing out sometime

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@larziwau @dankmeme01