From 94d0f7a286f0e74031056346626ef45c107559c4 Mon Sep 17 00:00:00 2001 From: Ben Carter Date: Thu, 5 Sep 2024 19:55:58 -0400 Subject: [PATCH] Added faster linker --- .github/workflows/add-to-project.yml | 3 ++- apps/docker/Dockerfile | 8 ++++++-- docker-compose.yml | 2 ++ src/server/game/Scripting/ScriptMgr.cpp | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml index 9221efed1..411d5ec25 100644 --- a/.github/workflows/add-to-project.yml +++ b/.github/workflows/add-to-project.yml @@ -10,6 +10,7 @@ env: jobs: assign_one_project: runs-on: ubuntu-latest + if: github.repository == 'azerothcore/azerothcore-wotlk' name: Assign to One Project steps: @@ -103,4 +104,4 @@ jobs: contains(github.event.issue.labels.*.name, '80') with: project: 'https://github.com/azerothcore/azerothcore-wotlk/projects/38' - + diff --git a/apps/docker/Dockerfile b/apps/docker/Dockerfile index 897b14305..3c731d9a6 100644 --- a/apps/docker/Dockerfile +++ b/apps/docker/Dockerfile @@ -42,7 +42,8 @@ WORKDIR /azerothcore FROM skeleton AS build ARG CTOOLS_BUILD="all" -ARG CTYPE="RelWithDebInfo" +# ARG CTYPE="RelWithDebInfo" +ARG CTYPE="Release" ARG CCACHE_CPP2="true" ARG CSCRIPTPCH="OFF" ARG CSCRIPTS="static" @@ -53,7 +54,7 @@ ARG CMAKE_EXTRA_OPTIONS="" ARG GIT_DISCOVERY_ACROSS_FILESYSTEM=1 ARG CCACHE_DIR="/ccache" -ARG CCACHE_MAXSIZE="1000MB" +ARG CCACHE_MAXSIZE="1500MB" ARG CCACHE_SLOPPINESS="pch_defines,time_macros,include_file_mtime" ARG CCACHE_COMPRESS="" ARG CCACHE_COMPRESSLEVEL="9" @@ -99,6 +100,9 @@ RUN --mount=type=cache,target=/ccache,sharing=locked \ -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \ -DCMAKE_C_COMPILER_LAUNCHER="ccache" \ -DBoost_USE_STATIC_LIBS="ON" \ + -DCMAKE_LINKER=lld \ + -DCMAKE_CXX_LINKER=lld \ + -DCMAKE_C_LINKER=lld \ && cmake --build . --config "$CTYPE" -j $(($(nproc) + 1)) \ && cmake --install . --config "$CTYPE" diff --git a/docker-compose.yml b/docker-compose.yml index d965aa888..cddf22776 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -66,9 +66,11 @@ services: DOCKER_USER: ${DOCKER_USER:-acore} networks: - ac-network + stdin_open: true tty: true restart: unless-stopped + privileged: true env_file: ${DOCKER_AC_ENV_FILE:-conf/dist/env.ac} environment: diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 65292d17f..51fd88acd 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -234,7 +234,7 @@ void ScriptMgr::CheckIfScriptsInDatabaseExist() !ScriptRegistry::GetScriptById(sid) && !ScriptRegistry::GetScriptById(sid)) { - LOG_ERROR("sql.sql", "Script named '{}' is assigned in the database, but has no code!", scriptName); + LOG_ERROR("sql.sql", "Script named '{}' Id {} is assigned in the database, but has no code!", scriptName, sid); } } }