From ef0c3d388dade898b21af7999e3386a6ae3ea8d2 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Wed, 31 Aug 2022 11:44:16 +0200
Subject: [PATCH] Upgrade to Ubuntu 20.04 since 18.04 is deprecated

---
 .github/workflows/ci.yml  | 20 ++++++++++----------
 mk/install-build-tools.sh |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f925788..7cdedcf1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
   push:
 jobs:
   rustfmt:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: briansmith/actions-rs-toolchain@v1
@@ -20,7 +20,7 @@ jobs:
       - run: cargo fmt --all -- --check
 
   clippy:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: briansmith/actions-rs-toolchain@v1
@@ -36,7 +36,7 @@ jobs:
       - run: mk/clippy.sh
 
   audit:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: briansmith/actions-rs-toolchain@v1
@@ -63,7 +63,7 @@ jobs:
       - run: cargo audit --deny warnings
 
   deny:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: briansmith/actions-rs-toolchain@v1
@@ -89,7 +89,7 @@ jobs:
 
   # Verify that documentation builds.
   rustdoc:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     strategy:
       matrix:
@@ -116,7 +116,7 @@ jobs:
           cargo doc --all-features
 
   package:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: briansmith/actions-rs-toolchain@v1
@@ -172,16 +172,16 @@ jobs:
 
         include:
           - target: arm-unknown-linux-gnueabihf
-            host_os: ubuntu-18.04
+            host_os: ubuntu-20.04
 
           - target: i686-pc-windows-msvc
             host_os: windows-latest
 
           - target: x86_64-unknown-linux-musl
-            host_os: ubuntu-18.04
+            host_os: ubuntu-20.04
 
           - target: x86_64-unknown-linux-gnu
-            host_os: ubuntu-18.04
+            host_os: ubuntu-20.04
 
     steps:
       - if: ${{ contains(matrix.host_os, 'ubuntu') }}
@@ -233,7 +233,7 @@ jobs:
         # TODO: targets
         include:
           - target: x86_64-unknown-linux-musl
-            host_os: ubuntu-18.04
+            host_os: ubuntu-20.04
 
     steps:
       - if: ${{ contains(matrix.host_os, 'ubuntu') }}
diff --git a/mk/install-build-tools.sh b/mk/install-build-tools.sh
index db50246e..0f825646 100755
--- a/mk/install-build-tools.sh
+++ b/mk/install-build-tools.sh
@@ -86,7 +86,7 @@ if [ -n "$use_clang" ]; then
   # format to one that only LLVM 11+ can use
   llvm_version=12
   sudo apt-key add mk/llvm-snapshot.gpg.key
-  sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-$llvm_version main"
+  sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-$llvm_version main"
   sudo apt-get update
   install_packages clang-$llvm_version llvm-$llvm_version
 fi