From f3e77c51a2dbe7464634d02685b8b44e20cabd6f Mon Sep 17 00:00:00 2001
From: Matthew Richards <matthew.richards@stfc.ac.uk>
Date: Thu, 16 Sep 2021 17:15:42 +0000
Subject: [PATCH 1/3]  #239: Change CI to use Ubuntu 20

---
 .github/workflows/ci-build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 01c91c6e..7c2f31bb 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -7,7 +7,7 @@ on:
       - master
 jobs:
   tests:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.0
     strategy:
       fail-fast: false
       matrix:
@@ -91,7 +91,7 @@ jobs:
       uses: codecov/codecov-action@v1
 
   linting:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     name: Linting
     steps:
     - name: Setup Python
@@ -111,7 +111,7 @@ jobs:
       run: nox -s lint
 
   formatting:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     name: Code Formatting
     steps:
     - name: Setup Python
@@ -131,7 +131,7 @@ jobs:
       run: nox -s black
 
   safety:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     name: Dependency Safety
     steps:
     - name: Setup Python
@@ -151,7 +151,7 @@ jobs:
       run: nox -s safety
 
   generator-script-testing:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     continue-on-error: true
     name: icatdb Generator Script Consistency Test
     steps:

From 0d642a9ccb51603a4a1a1dd1300ecd5b837db11c Mon Sep 17 00:00:00 2001
From: Matthew Richards <matthew.richards@stfc.ac.uk>
Date: Thu, 16 Sep 2021 17:22:56 +0000
Subject: [PATCH 2/3]  #239: Use ICAT Ansible branch compatible with Ubuntu 20

---
 .github/workflows/ci-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 7c2f31bb..909813e6 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -34,7 +34,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         repository: icatproject-contrib/icat-ansible
-        ref: change-payara-setup-script-url
+        ref: ubuntu-20-work
         path: icat-ansible
     - name: Install Ansible
       run: pip install -r icat-ansible/requirements.txt
@@ -175,7 +175,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: icatproject-contrib/icat-ansible
-          ref: change-payara-setup-script-url
+          ref: ubuntu-20-work
           path: icat-ansible
       - name: Install Ansible
         run: pip install -r icat-ansible/requirements.txt

From 0439c0d9b9b7ae14394a92433b8677020525689f Mon Sep 17 00:00:00 2001
From: Matthew Richards <matthew.richards@stfc.ac.uk>
Date: Fri, 17 Sep 2021 12:08:56 +0000
Subject: [PATCH 3/3]  #239: Correct OS version

---
 .github/workflows/ci-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 909813e6..74baae26 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -7,7 +7,7 @@ on:
       - master
 jobs:
   tests:
-    runs-on: ubuntu-20.0
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix: