Skip to content

Commit 6312bfd

Browse files
author
Github Actions
committed
Merge 3.3.5-base_patch to 3.3.5-passive_anticheat
2 parents 2ad1376 + 7de0aa2 commit 6312bfd

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

‎.github/workflows/win-x64-build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ jobs:
99
runs-on: windows-latest
1010
env:
1111
CMAKE_BUILD_TYPE: RelWithDebInfo
12-
MYSQL_ROOT_DIR: C:/Program Files/MySQL/MySQL Server 8.0
1312
OPENSSL_ROOT_DIR: C:/libs/openssl
1413
steps:
1514
- uses: actions/checkout@v7
@@ -83,9 +82,10 @@ jobs:
8382
- name: Copy Dependencies
8483
run: |
8584
cd ${{ steps.strings.outputs.build-output-dir }}/bin/${{ env.CMAKE_BUILD_TYPE }}
86-
copy "${{ env.MYSQL_ROOT_DIR }}/lib/libmysql.dll" libmysql.dll
85+
$mysqlRootPath = (Get-Item (Get-Content ${{ steps.strings.outputs.build-output-dir }}/CMakeCache.txt | Select-String '^MySQL_LIBRARY:FILEPATH=').ToString().Split('=')[1]).Directory.Parent.FullName
86+
copy "$mysqlRootPath/lib/libmysql.dll" libmysql.dll
8787
# mysql may depend on a different version of openssl so copy its dlls first (override later with openssl's own if same version)
88-
Copy-Item -Path "${{ env.MYSQL_ROOT_DIR }}/bin/*" -Include libcrypto*,libssl* -Destination .
88+
Copy-Item -Path "$mysqlRootPath/bin/*" -Include libcrypto*,libssl* -Destination .
8989
Copy-Item -Path "${{ env.OPENSSL_ROOT_DIR }}/bin/*" -Include libcrypto*,libssl*,legacy* -Destination .
9090
9191
- name: Check binaries
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
--
2+
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=45761 AND `SourceId`=0 AND `ElseGroup`=0 AND `ConditionTypeOrReference`=31 AND `ConditionTarget`=0 AND `ConditionValue1`=3 AND `ConditionValue2`=24921;
3+
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ConditionStringValue1`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
4+
(13, 1, 45761, 0, 0, 31, 0, 3, 24921, 0, '', 0, 0, 0, '', "Valiance Rifleman's Shoot Gun should only target Cosmetic Trigger - LAB");
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--
2+
UPDATE `quest_template_addon` SET `PrevQuestID`=10299 WHERE `ID`=10246;

0 commit comments

Comments
 (0)