From 587b02d467819b74c4ef3111b398656cecff756d Mon Sep 17 00:00:00 2001
From: Eyal Bukchin <eyalb181@gmail.com>
Date: Mon, 22 Aug 2022 16:11:05 +0300
Subject: [PATCH] Remove usage of ubuntu-18.04 (#271)

* Remove usage of ubuntu-18.04

* Add changelog
---
 .github/workflows/ci.yaml      | 6 +-----
 .github/workflows/release.yaml | 2 +-
 CHANGELOG.md                   | 3 +++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 42cad9edc22..222a52ede45 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -77,7 +77,7 @@ jobs:
   test_mirrord_layer_cli:
     strategy:
       matrix:
-        os: [ubuntu-latest, ubuntu-18.04, macos-12, macos-11]
+        os: [ubuntu-latest, macos-12, macos-11]
         target:
           [x86_64-unknown-linux-gnu, x86_64-apple-darwin, aarch64-apple-darwin]
         exclude:
@@ -85,10 +85,6 @@ jobs:
             target: x86_64-apple-darwin
           - os: ubuntu-latest
             target: aarch64-apple-darwin
-          - os: ubuntu-18.04
-            target: x86_64-apple-darwin
-          - os: ubuntu-18.04
-            target: aarch64-apple-darwin
           - os: macos-12
             target: x86_64-unknown-linux-gnu
           - os: macos-11
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index dad6eda1aaf..565e9e01ad1 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-latest
             extension: so
             target: x86_64-unknown-linux-gnu
     runs-on: ${{matrix.os}}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12bc00fab7e..682971c1cf5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 ## [Unreleased]
 
+### Fixed
+- CI - remove usage of ubuntu-18.04 machines (deprecated)
+
 ## 2.8.0
 
 ### Added