From c5c24616f8577ff435bd7a0365d793a4543c155e Mon Sep 17 00:00:00 2001
From: Sven Klemm <sven@timescale.com>
Date: Mon, 15 Mar 2021 15:03:07 +0100
Subject: [PATCH] Switch CI to Ubuntu 20.04

Switch CI tasks currently running on Ubuntu 18.04 to 20.04 and
also switch some tasks that dont require specific version because
they run in docker containers to use ubuntu-latest instead.
All tasks switched to ubuntu-latest are expected to be ubuntu-version
agnostic because they run their actions in docker containers.
---
 .../workflows/alpine-32bit-build-and-test.yaml   |  2 +-
 .github/workflows/apt-packages.yaml              |  2 +-
 .github/workflows/code_style.yaml                |  2 +-
 .github/workflows/coverity.yaml                  |  2 +-
 .github/workflows/cron-tests.yaml                | 16 ++++------------
 .github/workflows/rpm-packages.yaml              |  2 +-
 .github/workflows/update-test.yaml               |  2 +-
 scripts/gh_matrix_builder.py                     |  2 +-
 8 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/alpine-32bit-build-and-test.yaml b/.github/workflows/alpine-32bit-build-and-test.yaml
index f20f95744..ab16bd248 100644
--- a/.github/workflows/alpine-32bit-build-and-test.yaml
+++ b/.github/workflows/alpine-32bit-build-and-test.yaml
@@ -10,7 +10,7 @@ on:
 jobs:
   regress_linux_32bit:
     name: PG${{ matrix.pg }} ${{ matrix.build_type }} linux-i386
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     container:
       image: i386/postgres:${{ matrix.pg }}-alpine
       env:
diff --git a/.github/workflows/apt-packages.yaml b/.github/workflows/apt-packages.yaml
index 8bf236584..4ffb4d39a 100644
--- a/.github/workflows/apt-packages.yaml
+++ b/.github/workflows/apt-packages.yaml
@@ -11,7 +11,7 @@ on:
 jobs:
   apt_tests:
     name: APT ${{ matrix.image }} PG${{ matrix.pg }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     container:
       image: ${{ matrix.image }}
       env:
diff --git a/.github/workflows/code_style.yaml b/.github/workflows/code_style.yaml
index 0e490d508..6b5525690 100644
--- a/.github/workflows/code_style.yaml
+++ b/.github/workflows/code_style.yaml
@@ -12,7 +12,7 @@ on:
 jobs:
   misc_checks:
     name: Check formatting, license and git hooks
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
     steps:
diff --git a/.github/workflows/coverity.yaml b/.github/workflows/coverity.yaml
index 95d699ca1..8136a7258 100644
--- a/.github/workflows/coverity.yaml
+++ b/.github/workflows/coverity.yaml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         pg: ["12.6", "13.2"]
-        os: [ubuntu-18.04]
+        os: [ubuntu-20.04]
     env:
       PG_SRC_DIR: pgbuild
       PG_INSTALL_DIR: postgresql
diff --git a/.github/workflows/cron-tests.yaml b/.github/workflows/cron-tests.yaml
index cea9e570c..ea87237b1 100644
--- a/.github/workflows/cron-tests.yaml
+++ b/.github/workflows/cron-tests.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
   abi_breakage:
     name: ABI Breakage PG${{ matrix.pg }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -35,7 +35,7 @@ jobs:
 
   sanitizer:
     name: ASAN and UBSAN
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
 
@@ -49,7 +49,7 @@ jobs:
 
   memory_leak:
     name: Memory leak on insert
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     env:
@@ -65,21 +65,13 @@ jobs:
 
   backup_and_restore:
     name: Backup and restore
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         pg: [11, 12, 13]
-        include:
-          - pg: 11
-            pg_minor_compile: 0
-          - pg: 12
-            pg_minor_compile: 0
-          - pg: 13
-            pg_minor_compile: 2
     env:
       PG_MAJOR: ${{ matrix.pg }}
-      PG_MINOR_COMPILE: ${{ matrix.pg_minor_compile }}
       PG_VERSION: ${{ matrix.pg }}
 
     steps:
diff --git a/.github/workflows/rpm-packages.yaml b/.github/workflows/rpm-packages.yaml
index 07e3c212d..c1d543bed 100644
--- a/.github/workflows/rpm-packages.yaml
+++ b/.github/workflows/rpm-packages.yaml
@@ -11,7 +11,7 @@ on:
 jobs:
   rpm_tests:
     name: RPM ${{ matrix.image }} PG${{ matrix.pg }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     container:
       image: ${{ matrix.image }}
     strategy:
diff --git a/.github/workflows/update-test.yaml b/.github/workflows/update-test.yaml
index c0e14265a..0deb24111 100644
--- a/.github/workflows/update-test.yaml
+++ b/.github/workflows/update-test.yaml
@@ -10,7 +10,7 @@ on:
 jobs:
   update_test:
     name: Update test PG${{ matrix.pg }}
-    runs-on: 'ubuntu-18.04'
+    runs-on: 'ubuntu-latest'
     strategy:
       matrix:
         pg: ["11.11","12.6","13.2"]
diff --git a/scripts/gh_matrix_builder.py b/scripts/gh_matrix_builder.py
index 1678403bb..4fe75d53f 100644
--- a/scripts/gh_matrix_builder.py
+++ b/scripts/gh_matrix_builder.py
@@ -51,7 +51,7 @@ def build_debug_config(overrides):
     "coverage": True,
     "llvm_config": "llvm-config-9",
     "clang": "clang-9",
-    "os": "ubuntu-18.04",
+    "os": "ubuntu-20.04",
     "cc": "gcc",
     "cxx": "g++",
   })