Merge aee5be9f189820deb61665d5a52da3fb0a00a29a into 9b3f9f356db1ed29ca8a098cad3682d041b0c5fd

Fix some cereal includes
Bump golang.org/x/crypto in /utils/scripts/build/should-release (#5032 )
2025-12-11 12:41:30 +00:00 · 2025-12-05 03:53:43 +00:00 · 2025-12-04 19:53:31 -08:00 · 2025-11-20 19:44:17 +01:00
5 changed files with 10 additions and 12 deletions
--- a/common/eq_packet_structs.h
+++ b/common/eq_packet_structs.h
@ -23,9 +23,9 @@
 #include <string.h>
 #include <string>
 #include <time.h>
-#include "../cereal/include/cereal/archives/binary.hpp"
-#include "../cereal/include/cereal/types/string.hpp"
-#include "../cereal/include/cereal/types/vector.hpp"
+#include <cereal/archives/binary.hpp>
+#include <cereal/types/string.hpp>
+#include <cereal/types/vector.hpp>
 #include "../common/version.h"
 #include "emu_constants.h"
 #include "textures.h"
--- a/common/patches/uf.cpp
+++ b/common/patches/uf.cpp
@ -38,7 +38,7 @@
 #include "../raid.h"
 #include "../guilds.h"
 //#include "../repositories/trader_repository.h"
-#include "../cereal/include/cereal/types/vector.hpp"
+#include <cereal/types/vector.hpp>

 #include <iostream>
 #include <sstream>
--- a/common/repositories/trader_repository.h
+++ b/common/repositories/trader_repository.h
@ -7,8 +7,8 @@
 #include "items_repository.h"
 #include "../../common/item_data.h"
 #include "../../common/races.h"
-#include "../cereal/include/cereal/archives/binary.hpp"
-#include "../cereal/include/cereal/types/string.hpp"
+#include <cereal/archives/binary.hpp>
+#include <cereal/types/string.hpp>

 class TraderRepository : public BaseTraderRepository {
 public:
--- a/utils/scripts/build/should-release/go.mod
+++ b/utils/scripts/build/should-release/go.mod
@ -1,8 +1,6 @@
 module should-release

-go 1.23.0
-
-toolchain go1.23.5
+go 1.24.0

 require (
 	github.com/google/go-github/v41 v41.0.0
@ -11,5 +9,5 @@ require (

 require (
 	github.com/google/go-querystring v1.1.0 // indirect
-	golang.org/x/crypto v0.36.0 // indirect
+	golang.org/x/crypto v0.45.0 // indirect
 )
--- a/utils/scripts/build/should-release/go.sum
+++ b/utils/scripts/build/should-release/go.sum
@ -10,8 +10,8 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
Author	SHA1	Message	Date
Alex	ac1093f053	Merge aee5be9f189820deb61665d5a52da3fb0a00a29a into 9b3f9f356db1ed29ca8a098cad3682d041b0c5fd	2025-12-05 03:53:43 +00:00
KimLS	aee5be9f18	Fix some cereal includes	2025-12-04 19:53:31 -08:00
dependabot[bot]	9b3f9f356d	Bump golang.org/x/crypto in /utils/scripts/build/should-release (#5032 ) Some checks failed Build / Linux (push) Has been cancelled Details Build / Windows (push) Has been cancelled Details Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.36.0 to 0.45.0. - [Commits](https://github.com/golang/crypto/compare/v0.36.0...v0.45.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.45.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-11-20 19:44:17 +01:00