From a648682ed63a257bf864729d4eb3c703476eebb8 Mon Sep 17 00:00:00 2001
From: native-api <vano@mail.mipt.ru>
Date: Sun, 4 Sep 2022 01:40:00 +0300
Subject: [PATCH] CI: Bump OS versions (#2448)

* CI: Bump OS versions

Github released ubuntu-22.04 and macos-12 from beta
and deprecated ubuntu-18.04 and macos-10.15, due to dropping by 2013.

* CI: clean up installed packages
---
 .github/workflows/macos_build.yml            |  2 +-
 .github/workflows/modified_scripts_build.yml | 10 +++++-----
 .github/workflows/pyenv_tests.yml            |  4 ++--
 .github/workflows/ubuntu_build.yml           |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml
index 17f7650a..7b39ec76 100644
--- a/.github/workflows/macos_build.yml
+++ b/.github/workflows/macos_build.yml
@@ -10,7 +10,7 @@ jobs:
           - 3.8.13
           - 3.9.13
           - 3.10.6
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
       # Normally, we would use the superbly maintained...
diff --git a/.github/workflows/modified_scripts_build.yml b/.github/workflows/modified_scripts_build.yml
index 0544ada3..56c79065 100644
--- a/.github/workflows/modified_scripts_build.yml
+++ b/.github/workflows/modified_scripts_build.yml
@@ -27,7 +27,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions)}}
-        os: ["macos-10.15", "macos-11"]
+        os: ["macos-11", "macos-12"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -77,15 +77,15 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions)}}
-        os: ["ubuntu-18.04", "ubuntu-20.04"]
+        os: ["ubuntu-20.04", "ubuntu-22.04"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - run: |
-          sudo apt-get update -q; sudo apt-get install -yq build-essential \
+          sudo apt-get update -q; sudo apt-get install -yq make build-essential \
             libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev \
-            wget curl llvm libncurses5-dev libncursesw5-dev \
-            xz-utils tk-dev libffi-dev liblzma-dev python-openssl git
+            curl llvm libncurses5-dev libncursesw5-dev \
+            xz-utils tk-dev libffi-dev liblzma-dev
       - run: |
           export PYENV_ROOT="$GITHUB_WORKSPACE"
           echo "PYENV_ROOT=$PYENV_ROOT" >> $GITHUB_ENV
diff --git a/.github/workflows/pyenv_tests.yml b/.github/workflows/pyenv_tests.yml
index 7963922c..2d3ba3c6 100644
--- a/.github/workflows/pyenv_tests.yml
+++ b/.github/workflows/pyenv_tests.yml
@@ -6,10 +6,10 @@ jobs:
       fail-fast: false
       matrix:
         os:
+          - ubuntu-22.04
           - ubuntu-20.04
-          - ubuntu-18.04
+          - macos-12
           - macos-11
-          - macos-10.15
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/ubuntu_build.yml b/.github/workflows/ubuntu_build.yml
index 2b9a306a..97e1b081 100644
--- a/.github/workflows/ubuntu_build.yml
+++ b/.github/workflows/ubuntu_build.yml
@@ -10,7 +10,7 @@ jobs:
           - 3.8.13
           - 3.9.13
           - 3.10.6
-    runs-on: Ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       # Normally, we would use the superbly maintained...
@@ -19,9 +19,9 @@ jobs:
       #    python-version: ${{ matrix.python-version }}
       # ... but in the repo, we want to test pyenv builds on Ubuntu
       - run: |
-          sudo apt-get install -y build-essential libssl-dev zlib1g-dev libbz2-dev \
-              libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
-              xz-utils tk-dev libffi-dev liblzma-dev python-openssl git
+          sudo apt-get install -yq make build-essential libssl-dev zlib1g-dev \
+          libbz2-dev libreadline-dev libsqlite3-dev curl \
+          libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev
       # https://github.com/pyenv/pyenv#installation
       - run: pwd
       - env: