diff options
| -rw-r--r-- | .github/SECURITY.md | 4 | ||||
| -rw-r--r-- | .github/workflows/core_build.yml | 2 | ||||
| -rw-r--r-- | apps/ci/ci-conf.sh | 8 | ||||
| -rw-r--r-- | apps/ci/ci-install.sh | 8 | ||||
| -rw-r--r-- | src/cmake/compiler/clang/settings.cmake | 2 | ||||
| -rw-r--r-- | src/cmake/compiler/gcc/settings.cmake | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/.github/SECURITY.md b/.github/SECURITY.md index 07cc2d3455..88151dc462 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -38,8 +38,8 @@ Versions of CLang: | 11 | :white_check_mark: | | 10 | :white_check_mark: | | 9 | :white_check_mark: | -| 6 | :white_check_mark: | -| 5 and lower | :red_circle: | +| 7 | :white_check_mark: | +| 6 and lower | :red_circle: | Versions of GCC: diff --git a/.github/workflows/core_build.yml b/.github/workflows/core_build.yml index d54fd10319..de53db9be8 100644 --- a/.github/workflows/core_build.yml +++ b/.github/workflows/core_build.yml @@ -30,7 +30,7 @@ jobs: modules: without extra_logs: false - os: ubuntu-18.04 - compiler: clang # default in 18.04 is clang 6 + compiler: clang7 modules: without extra_logs: false - os: ubuntu-18.04 diff --git a/apps/ci/ci-conf.sh b/apps/ci/ci-conf.sh index b853f50a8f..3930d06656 100644 --- a/apps/ci/ci-conf.sh +++ b/apps/ci/ci-conf.sh @@ -47,10 +47,10 @@ case $COMPILER in echo "CCOMPILERCXX=\"clang++\"" >> ./conf/config.sh ;; - "clang6" ) - time sudo apt-get install -y clang-6.0 - echo "CCOMPILERC=\"clang-6.0\"" >> ./conf/config.sh - echo "CCOMPILERCXX=\"clang++-6.0\"" >> ./conf/config.sh + "clang7" ) + time sudo apt-get install -y clang-7 + echo "CCOMPILERC=\"clang-7\"" >> ./conf/config.sh + echo "CCOMPILERCXX=\"clang++-7\"" >> ./conf/config.sh ;; "clang8" ) diff --git a/apps/ci/ci-install.sh b/apps/ci/ci-install.sh index 14d3395e87..76029caebf 100644 --- a/apps/ci/ci-install.sh +++ b/apps/ci/ci-install.sh @@ -52,10 +52,10 @@ case $COMPILER in echo "CCOMPILERCXX=\"clang++\"" >> ./conf/config.sh ;; - "clang6" ) - time sudo apt-get install -y clang-6.0 - echo "CCOMPILERC=\"clang-6.0\"" >> ./conf/config.sh - echo "CCOMPILERCXX=\"clang++-6.0\"" >> ./conf/config.sh + "clang7" ) + time sudo apt-get install -y clang-7 + echo "CCOMPILERC=\"clang-7\"" >> ./conf/config.sh + echo "CCOMPILERCXX=\"clang++-7\"" >> ./conf/config.sh ;; "clang8" ) diff --git a/src/cmake/compiler/clang/settings.cmake b/src/cmake/compiler/clang/settings.cmake index b3eb165f60..7295797dbe 100644 --- a/src/cmake/compiler/clang/settings.cmake +++ b/src/cmake/compiler/clang/settings.cmake @@ -14,7 +14,7 @@ target_compile_definitions(acore-compile-option-interface INTERFACE -D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") -set(CLANG_EXPECTED_VERSION 6.0.0) +set(CLANG_EXPECTED_VERSION 7.0.0) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS CLANG_EXPECTED_VERSION) message(FATAL_ERROR "Clang: AzerothCore requires version ${CLANG_EXPECTED_VERSION} to build but found ${CMAKE_CXX_COMPILER_VERSION}") diff --git a/src/cmake/compiler/gcc/settings.cmake b/src/cmake/compiler/gcc/settings.cmake index 7519278053..7183e002ff 100644 --- a/src/cmake/compiler/gcc/settings.cmake +++ b/src/cmake/compiler/gcc/settings.cmake @@ -8,7 +8,7 @@ target_compile_definitions(acore-compile-option-interface INTERFACE -D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") -set(GCC_EXPECTED_VERSION 7.0.0) +set(GCC_EXPECTED_VERSION 8.0.0) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS GCC_EXPECTED_VERSION) message(FATAL_ERROR "GCC: This project requires version ${GCC_EXPECTED_VERSION} to build but found ${CMAKE_CXX_COMPILER_VERSION}") |