Explorar el Código

Updates github CI version for Ubuntu (#7204)

Changed clang minimum version to version 6
Removed unsupported clang versions from version matrix
Lemongrass3110 hace 2 años
padre
commit
b68e59f743

+ 4 - 4
.github/workflows/build_servers_clang.yml

@@ -22,11 +22,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-18.04.
-          # Available: ubuntu-20.04, ubuntu-18.04
-          os: [ubuntu-18.04]
+          # The ubuntu-latest label currently points to ubuntu-20.04.
+          # Available: ubuntu-22.04, ubuntu-20.04
+          os: [ubuntu-latest]
           # Version list can be found on https://github.com/marketplace/actions/install-clang
-          clang: ['3.9', '4.0', '5.0', '6.0', '7', '8', '9', '10', '11'] #, '12', '13']
+          clang: ['6.0', '7', '8', '9', '10', '11'] #, '12', '13']
 
     steps:
       - uses: actions/checkout@v2

+ 2 - 2
.github/workflows/build_servers_cmake.yml

@@ -22,8 +22,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-18.04.
-          # Available: ubuntu-20.04, ubuntu-18.04
+          # The ubuntu-latest label currently points to ubuntu-20.04.
+          # Available: ubuntu-22.04, ubuntu-20.04
           os: [ubuntu-latest]
 
     steps:

+ 2 - 2
.github/workflows/build_servers_gcc.yml

@@ -22,8 +22,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-18.04.
-          # Available: ubuntu-20.04, ubuntu-18.04
+          # The ubuntu-latest label currently points to ubuntu-20.04.
+          # Available: ubuntu-22.04, ubuntu-20.04
           os: [ubuntu-latest]
           # Older versions of GCC are not available via unaltered aptitude repo lists.
           gcc: ['7', '8', '9', '10']

+ 2 - 2
.github/workflows/build_servers_modes.yml

@@ -22,8 +22,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-18.04.
-          # Available: ubuntu-20.04, ubuntu-18.04	
+          # The ubuntu-latest label currently points to ubuntu-20.04.
+          # Available: ubuntu-22.04, ubuntu-20.04
           os: [ubuntu-latest]
           # Older versions of GCC are not available via unaltered aptitude repo lists.
           gcc: ['10']

+ 2 - 2
.github/workflows/build_servers_packetversions.yml

@@ -22,8 +22,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-18.04.
-          # Available: ubuntu-20.04, ubuntu-18.04	
+          # The ubuntu-latest label currently points to ubuntu-20.04.
+          # Available: ubuntu-22.04, ubuntu-20.04
           os: [ubuntu-latest]
           # Older versions of GCC are not available via unaltered aptitude repo lists.
           gcc: ['10']

+ 2 - 2
.github/workflows/build_servers_vip.yml

@@ -22,8 +22,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-18.04.
-          # Available: ubuntu-20.04, ubuntu-18.04	
+          # The ubuntu-latest label currently points to ubuntu-20.04.
+          # Available: ubuntu-22.04, ubuntu-20.04
           os: [ubuntu-latest]
           # Older versions of GCC are not available via unaltered aptitude repo lists.
           gcc: ['10']

+ 2 - 2
.github/workflows/npc_db_validation.yml

@@ -25,8 +25,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-18.04.
-          # Available: ubuntu-20.04, ubuntu-18.04	
+          # The ubuntu-latest label currently points to ubuntu-20.04.
+          # Available: ubuntu-22.04, ubuntu-20.04
           os: [ubuntu-latest]
           # Only a single version of GCC is required for validating NPC scripts and database changes.
           gcc: ['10']

+ 2 - 2
src/common/core.cpp

@@ -30,8 +30,8 @@
 #ifndef DEPRECATED_COMPILER_SUPPORT
 	#if defined( _MSC_VER ) && _MSC_VER < 1900
 		#error "Visual Studio versions older than Visual Studio 2015 are not officially supported anymore"
-	#elif defined( __clang__ ) && __clang_major__ < 4 && !( __clang_major__ == 3 && __clang_minor__ >= 7 )
-		#error "clang versions older than clang 3.7 are not officially supported anymore"
+	#elif defined( __clang__ ) && __clang_major__ < 6
+		#error "clang versions older than clang 6.0 are not officially supported anymore"
 	#elif !defined( __clang__ ) && defined( __GNUC__ ) && __GNUC__ < 5
 		#error "GCC versions older than GCC 5 are not officially supported anymore"
 	#endif