From b32b58128d2817dd53048b2ed0860b01cb5dceab Mon Sep 17 00:00:00 2001
From: Matt Shaw <matthew.shaw@landregistry.gov.uk>
Date: Wed, 7 Feb 2024 11:27:00 +0000
Subject: [PATCH] backports

---
 .github/CODEOWNERS                   |  1 +
 .github/workflows/codeql.yml         |  4 ++--
 .github/workflows/python-package.yml |  4 ++--
 CHANGELOG.md                         | 12 +++++++++++-
 tests/utils/test-entrypoint.sh       |  2 +-
 5 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..8a7d758b
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+*       @matthew-shaw
\ No newline at end of file
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 8beb9857..b121cdbd 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "v2" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "main" ]
+    branches: [ "v2" ]
   schedule:
     - cron: '41 2 * * 2'
 
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 9eee201d..dc1c185a 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -5,9 +5,9 @@ name: Python package
 
 on:
   push:
-    branches: [ main ]
+    branches: [ v2 ]
   pull_request:
-    branches: [ main ]
+    branches: [ v2 ]
 
 jobs:
   build:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b14e2e0..01988484 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/LandRegistry/govuk-frontend-jinja/compare/2.8.0...main)
+## [Unreleased](https://github.com/LandRegistry/govuk-frontend-jinja/compare/2.8.0...v2)
 
 ## [2.8.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/2.8.0) - 06/02/2024
 
@@ -80,6 +80,16 @@ Thanks to [Indigo Harrington](https://github.com/SentientHousePlant)
 
 - Python 3.6 support
 
+## [1.6.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/1.6.0) -07/02/2024
+
+### Added
+
+- [GOV.UK Frontend v3.15.0](https://github.com/alphagov/govuk-frontend/releases/tag/v3.15.0) support
+
+### Removed
+
+- Python 3.6 support
+
 ## [1.5.1](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/1.5.1) -14/10/2021
 
 ### Fixed
diff --git a/tests/utils/test-entrypoint.sh b/tests/utils/test-entrypoint.sh
index 873d2377..a6c58f8b 100755
--- a/tests/utils/test-entrypoint.sh
+++ b/tests/utils/test-entrypoint.sh
@@ -5,4 +5,4 @@ set -e
 flake8 .
 (cd tests/utils && nohup python -m flask run --port 3000 &)
 wait-for-it localhost:3000
-./govuk-frontend-diff http://localhost:3000 --govuk-frontend-version=v4.8.0
+./govuk-frontend-diff http://localhost:3000 --govuk-frontend-version=v4.8.0 --ci