From f1150eddf635f4cd9792c368166abd63eb62165d Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 21 Oct 2020 16:17:29 +0200
Subject: [PATCH 1/3] ci: bump the 'build test' image to Ubuntu Focal

---
 .github/workflows/build_test.yml        | 2 +-
 .github/workflows/ubuntu-build-check.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 3b86689d27..f73a141420 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/ubuntu-build-check.sh b/.github/workflows/ubuntu-build-check.sh
index 75fc36fffb..2d207b789e 100755
--- a/.github/workflows/ubuntu-build-check.sh
+++ b/.github/workflows/ubuntu-build-check.sh
@@ -19,7 +19,6 @@ PACKAGES=(
     expect
     fdisk
     gettext
-    iptables-dev
     iputils-ping
     isc-dhcp-client
     itstool
@@ -39,6 +38,7 @@ PACKAGES=(
     libssl-dev
     libxkbcommon-dev
     libzstd-dev
+    libxtables-dev
     mount
     net-tools
     perl

From 0273f6e7f2c23e3b4ffc5499297c5f193eb9f75a Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 21 Oct 2020 16:18:50 +0200
Subject: [PATCH 2/3] ci: build with clang-11 as well

The LLVM nightly repositories now have a separate branch for clang-11,
so let's build with it as well.
---
 .github/workflows/build_test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index f73a141420..c9aec779c8 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -20,6 +20,7 @@ jobs:
         env:
           - { COMPILER: "gcc",   COMPILER_VERSION: "10" }
           - { COMPILER: "clang", COMPILER_VERSION: "10" }
+          - { COMPILER: "clang", COMPILER_VERSION: "11" }
     env: ${{ matrix.env }}
     steps:
       - name: Repository checkout

From 5310fc624e42e6f5a18f8fd8dce8e304a94e8e5e Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 21 Oct 2020 16:28:22 +0200
Subject: [PATCH 3/3] ci: add the libfido2 dependency for better coverage

---
 .github/workflows/ubuntu-build-check.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ubuntu-build-check.sh b/.github/workflows/ubuntu-build-check.sh
index 2d207b789e..0892e08dd1 100755
--- a/.github/workflows/ubuntu-build-check.sh
+++ b/.github/workflows/ubuntu-build-check.sh
@@ -27,6 +27,7 @@ PACKAGES=(
     libcap-dev
     libcurl4-gnutls-dev
     libfdisk-dev
+    libfido2-dev
     libgpg-error-dev
     liblz4-dev
     liblzma-dev
@@ -37,8 +38,8 @@ PACKAGES=(
     libqrencode-dev
     libssl-dev
     libxkbcommon-dev
-    libzstd-dev
     libxtables-dev
+    libzstd-dev
     mount
     net-tools
     perl