From: Michael Wallner <mike@php.net>
Date: Tue, 21 Feb 2023 11:48:03 +0000 (+0100)
Subject: ci: gh-actions: remove ubuntu-18.04
X-Git-Tag: 1.1.4~20
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=4198e599a7b7368b576802180d2846569ca851ce;p=awesomized%2Flibmemcached

ci: gh-actions: remove ubuntu-18.04
---

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index a7164e09..9bc92a43 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -69,22 +69,6 @@ const MAP = [
         ]
       ]
     ],
-    "ubuntu-18.04" => [
-      'env.CC_VND' => [
-        "gnu" => [
-          'env.CC_VER' => [
-            "new"  => "-10",
-            "cur"  => "-9",
-            "old"  => "-7"
-          ]
-        ],
-        "clang" => [
-          'env.CC_VER' => [
-            "cur"  => "-9",
-          ]
-        ]
-      ]
-    ],
   ]
 ];
 const ENV = [
@@ -120,19 +104,6 @@ const ENV = [
       ],
     ]
   ],
-  "ubuntu-18.04" => [
-    "clang" => [
-      "new" => [
-        "CXXFLAGS" => "-stdlib=libc++"
-      ],
-      "cur" => [
-        "CXXFLAGS" => "-stdlib=libc++"
-      ],
-      "old" => [
-        "CXXFLAGS" => "-stdlib=libc++"
-      ],
-    ]
-  ]
 ];
 
 /**
@@ -455,7 +426,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os_ver: [ubuntu-20.04, ubuntu-18.04]
+        os_ver: [ubuntu-22.04, ubuntu-20.04]
         cc_vnd: [gnu, clang]
         cc_ver: [new, cur, old]
     runs-on: ${{ matrix.os_ver }}
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index ed811a67..e9d41122 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -422,7 +422,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os_ver: [ubuntu-20.04, ubuntu-18.04]
+        os_ver: [ubuntu-22.04, ubuntu-20.04]
         cc_vnd: [gnu, clang]
         cc_ver: [new, cur, old]
     runs-on: ${{ matrix.os_ver }}
@@ -505,27 +505,6 @@ jobs:
           echo CXX="clang++-10" >> ${GITHUB_ENV}
           echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
           echo INSTALL_CXX="libc++-10-dev libc++abi-10-dev" >> ${GITHUB_ENV}
-      - name: Prepare environment (for new gnu on ubuntu-18.04)
-        if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='new')
-        run: |
-          echo CC="gcc-10" >> ${GITHUB_ENV}
-          echo CXX="g++-10" >> ${GITHUB_ENV}
-      - name: Prepare environment (for cur gnu on ubuntu-18.04)
-        if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
-        run: |
-          echo CC="gcc-9" >> ${GITHUB_ENV}
-          echo CXX="g++-9" >> ${GITHUB_ENV}
-      - name: Prepare environment (for old gnu on ubuntu-18.04)
-        if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='old')
-        run: |
-          echo CC="gcc-7" >> ${GITHUB_ENV}
-          echo CXX="g++-7" >> ${GITHUB_ENV}
-      - name: Prepare environment (for cur clang on ubuntu-18.04)
-        if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='cur')
-        run: |
-          echo CC="clang-9" >> ${GITHUB_ENV}
-          echo CXX="clang++-9" >> ${GITHUB_ENV}
-          echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
       - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
         run: |