diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index c23c87be1..e579b89a7 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -28,7 +28,7 @@ jobs: runs-on: ${{ matrix.os }} name: ${{ matrix.os }} env: - BOOST_ROOT: C:\local\boost_1_82_0 + BOOST_ROOT: C:\local\boost_1_87_0 if: | github.repository == 'azerothcore/azerothcore-wotlk' && !github.event.pull_request.draft diff --git a/apps/installer/includes/functions.sh b/apps/installer/includes/functions.sh index 79fbb355d..7f179e5c1 100644 --- a/apps/installer/includes/functions.sh +++ b/apps/installer/includes/functions.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Set SUDO variable - one liner -if [[ "$OSTYPE" == "msys"* ]]; then +if [[ "$OSTYPE" == "msys"* || "$OSTYPE" == "cygwin"* ]]; then SUDO="" else SUDO=$([ "$EUID" -ne 0 ] && echo "sudo" || echo "") @@ -49,7 +49,7 @@ function inst_configureOS() { source "$AC_PATH_INSTALLER/includes/os_configs/$DISTRO.sh" ;; *bsd*) echo "BSD is not supported yet" ;; - msys*) source "$AC_PATH_INSTALLER/includes/os_configs/windows.sh" ;; + msys*|cygwin*) source "$AC_PATH_INSTALLER/includes/os_configs/windows.sh" ;; *) echo "This platform is not supported" ;; esac } diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp index 202464668..1c62f96a0 100644 --- a/src/server/scripts/Pet/pet_dk.cpp +++ b/src/server/scripts/Pet/pet_dk.cpp @@ -367,7 +367,7 @@ struct npc_pet_dk_army_of_the_dead : public AggressorAI AttackStart(attacker); } - void UpdateAI(uint32 diff) override + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) {