mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-07-23 11:37:45 +00:00
Code Activity

Merge pull request #981 from hkAlice/the-joys-of-cicd

Browse source 
[3.x] fix gh actions build;
This commit is contained in:
hkAlice 2025-07-22 19:01:04 -03:00 • committed by GitHub
commit 2be623218a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -35,7 +35,7 @@ jobs:
matrix:
buildType: [RelWithDebInfo, Debug]
runs-on: windows-2019
runs-on: windows-2025
steps:
- uses: actions/checkout@v3.3.0

3
cmake/FindMySQL.cmake
View file

@ -100,6 +100,7 @@ find_path(MYSQL_INCLUDE_DIR
"${PROGRAM_FILES_64}/MariaDB 10.7/include/mysql"
"${PROGRAM_FILES_64}/MariaDB 10.8/include/mysql"
"${PROGRAM_FILES_64}/MariaDB 10.9/include/mysql"
"${PROGRAM_FILES_64}/MariaDB 11.8/include/mysql"
"${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/include"
"${PROGRAM_FILES_64}/MySQL/include"
"C:/MySQL/include"
@ -144,6 +145,7 @@ if( WIN32 )
"${PROGRAM_FILES_64}/MariaDB 10.7/lib"
"${PROGRAM_FILES_64}/MariaDB 10.8/lib"
"${PROGRAM_FILES_64}/MariaDB 10.9/lib"
"${PROGRAM_FILES_64}/MariaDB 11.8/lib"
"${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib"
"${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt"
"${PROGRAM_FILES_64}/MySQL/lib"
@ -201,6 +203,7 @@ if( WIN32 )
"${PROGRAM_FILES_64}/MariaDB 10.5/bin"
"${PROGRAM_FILES_64}/MariaDB 10.6/bin"
"${PROGRAM_FILES_64}/MariaDB 10.7/bin"
"${PROGRAM_FILES_64}/MariaDB 11.8/bin"
"${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin"
"${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin/opt"
"${PROGRAM_FILES_64}/MySQL/bin"

3
src/common/Common.h
View file

@ -1182,7 +1182,7 @@ namespace Sapphire::Common
// Legacy subtypes - skipping
#pragma region Synth 1 -50 Recipes
// Synth 1 -50 Recipes
SynthWoodworkingLv01to10Recipes = 23,
SynthWoodworkingLv11to20Recipes = 24,
SynthWoodworkingLv21to30Recipes = 25,
@ -1223,7 +1223,6 @@ namespace Sapphire::Common
SynthCookingLv21to30Recipes = 60,
SynthCookingLv31to40Recipes = 61,
SynthCookingLv41to50Recipes = 62,
#pragma endregion
// TODO: Map gathering subtypes 63 to 128