diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-04-10 13:52:06 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-04-10 16:16:38 +0200 |
| commit | 6817ad93d72d09f79e69a840e8eaddaf388c0ee4 (patch) | |
| tree | 70776c609b40c9c54b6ac40defb91a7023997261 | |
| parent | 84220cb9a95c63e6dfd60028db8ad4b2d40c0db5 (diff) | |
Build: Update required GCC version to 11.1
(cherry picked from commit 16853af7c84b1204357333db399100604ab6cb29)
| -rw-r--r-- | .github/workflows/gcc-build.yml | 6 | ||||
| -rw-r--r-- | cmake/compiler/gcc/settings.cmake | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/gcc-build.yml b/.github/workflows/gcc-build.yml index 73830ebbd5a..1f6ade70002 100644 --- a/.github/workflows/gcc-build.yml +++ b/.github/workflows/gcc-build.yml @@ -6,13 +6,13 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: Dependencies run: | - sudo apt-get update && sudo apt-get install -yq libboost-all-dev g++-10 - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 + sudo apt-get update && sudo apt-get install -yq libboost-all-dev g++-11 + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11 - name: Setup run: | mkdir bin diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake index b756901f097..99417c1fbf9 100644 --- a/cmake/compiler/gcc/settings.cmake +++ b/cmake/compiler/gcc/settings.cmake @@ -3,7 +3,7 @@ target_compile_definitions(trinity-compile-option-interface INTERFACE -D_BUILD_DIRECTIVE="$<CONFIG>") -set(GCC_EXPECTED_VERSION 10.0.0) +set(GCC_EXPECTED_VERSION 11.1.0) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS GCC_EXPECTED_VERSION) message(FATAL_ERROR "GCC: TrinityCore requires version ${GCC_EXPECTED_VERSION} to build but found ${CMAKE_CXX_COMPILER_VERSION}") |