Upgrade Build: Add Ubuntu 22.04, remove Ubuntu 18.04 (#810) (#889)

Fixes #758 Co-authored-by: Shivam Negi <shivamnegi2019@gmail.com>
CppMicroServices · Aug 4, 2023 · 89d7135 · 89d7135
1 parent a197f2b
commit 89d7135
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/build_and_test_nix.yml b/.github/workflows/build_and_test_nix.yml
@@ -17,8 +17,8 @@ env:
 
 jobs:
   linux_minimum_supported_gcc_build:
-    name: Build and Test [ubuntu-18.04, Minimum GCC]
-    runs-on: ubuntu-18.04
+    name: Build and Test [ubuntu-20.04, Minimum GCC]
+    runs-on: ubuntu-20.04
     env:
       BUILD_CONFIGURATION: 0
       WITH_COVERAGE: 0
@@ -41,8 +41,8 @@ jobs:
         CXX: g++-7
 
   linux_clang_build:
-    name: Build and Test [ubuntu-18.04, Supported Clang]
-    runs-on: ubuntu-18.04
+    name: Build and Test [ubuntu-20.04, Supported Clang]
+    runs-on: ubuntu-20.04
     env:
       BUILD_CONFIGURATION: 0
       WITH_COVERAGE: 0
@@ -69,7 +69,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macOS-11, macos-12]
+        os: [ubuntu-22.04, macOS-11, macos-12]
         # build configurations:
         # 0 = threading ON / shared lib ON
         # 1 = threading ON / shared lib OFF
@@ -86,7 +86,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y valgrind
-      if: ${{matrix.os == 'ubuntu-20.04'}}
+      if: ${{matrix.os == 'ubuntu-22.04'}}
 
     - name: Build And Test
       run: ctest -VV -S ${{github.workspace}}/cmake/usCTestScript_github.cmake

diff --git a/.github/workflows/sanitizer_checks.yml b/.github/workflows/sanitizer_checks.yml
@@ -20,7 +20,7 @@ env:
 jobs:
   addresssanitizer_build:
     name: AddressSanitizer (with leak checking) Build and Test [Clang]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
       WITH_ASAN: 1
       ASAN_OPTIONS: "detect_leaks=1 symbolize=1 detect_odr_violation=1"
@@ -38,7 +38,7 @@ jobs:
 
   threadsanitizer_build:
     name: ThreadSanitizer Build and Test [Clang]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
       WITH_TSAN: 1
       TSAN_OPTIONS: "suppressions=${{github.workspace}}/tsan_suppressions.txt"
@@ -56,7 +56,7 @@ jobs:
 
   undefinedbehaviorsanitizer_build:
     name: UndefinedBehaviorSanitizer Build and Test [Clang]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
       WITH_UBSAN: 1
       UBSAN_OPTIONS: "suppressions=${{github.workspace}}/ubsan_suppressions.txt"

diff --git a/README.rst b/README.rst
@@ -81,18 +81,18 @@ software provided on the GitHub-hosted runners.
 For information about the specific versions of software the runners
 use, please see the following resources:
 
-- `ubuntu-18.04 Runner Information <https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md>`
 - `ubuntu-20.04 Runner Information <https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md>`
+- `ubuntu-22.04 Runner Information <https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md>`
 - `macos-11 Runner Information <https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md>`
 - `macos-12 Runner Information <https://github.com/actions/virtual-environments/blob/main/images/macos/macos-12-Readme.md>`
 - `windows-2019 Runner Information <https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md>`
 - `windows-2022 Runner Information <https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md>`
 
 Below is a list of tested compiler/OS combinations:
 
-- GCC 7.5.0 (Ubuntu 18.04)
 - GCC 9.4.0 (Ubuntu 20.04)
-- Clang 9.0 (Ubuntu 18.04)
+- GCC 9.5.0 (Ubuntu 22.04)
+- Clang 12.0.1 (Ubuntu 22.04)
 - Apple Clang, Xcode 13.2.0 (OS X 11.6.8)
 - Apple Clang, Xcode 13.4.0 (OS X 12.5.0)
 - Visual Studio 2019