From 58e36446ed2f6354f75d80c0e30589929b8cceca Mon Sep 17 00:00:00 2001
From: Daniel Couzens <dan.couzens@epimorphics.com>
Date: Mon, 7 Oct 2024 11:20:26 +0100
Subject: [PATCH 1/2] UKHPI: updates ruby version and alpine version

---
 .ruby-version      |  2 +-
 CHANGELOG.md       |  4 ++++
 Gemfile.lock       | 26 ++++++++++++++------------
 Makefile           |  2 +-
 app/lib/version.rb |  2 +-
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 338a5b5d..6a81b4c8 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.6
+2.7.8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21035496..70fcca3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changes to the UKHPI app by version and date
 
+## 1.7.6 - 2024-10
+
+- (Dan) Updates ruby version to 2.7.8 and alpine version to 3.16 [GH-455](https://github.com/epimorphics/ukhpi/issues/455)
+
 ## 1.7.5 - 2024-09
 
 - (Jon) Moved all mirrored configuration settings from individual environments
diff --git a/Gemfile.lock b/Gemfile.lock
index e782cb10..290c05f1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,5 +1,6 @@
 GEM
   remote: https://rubygems.org/
+  remote: https://rubygems.pkg.github.com/epimorphics/
   specs:
     actioncable (6.1.5)
       actionpack (= 6.1.5)
@@ -83,6 +84,10 @@ GEM
     childprocess (4.1.0)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
+    data_services_api (1.4.1.1)
+      faraday_middleware (~> 1.2.0)
+      json (~> 2.6.1)
+      yajl-ruby (~> 1.4.1)
     docile (1.4.0)
     ebnf (2.3.1)
       amazing_print (~> 1.4)
@@ -165,6 +170,10 @@ GEM
       railties (>= 4)
     json (2.6.3)
     json_expressions (0.9.0)
+    json_rails_logger (1.0.3)
+      json
+      lograge
+      railties
     link_header (0.0.8)
     lograge (0.12.0)
       actionpack (>= 4)
@@ -183,6 +192,7 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.7)
     minitest (5.18.1)
     minitest-rails (6.1.0)
       minitest (~> 5.10)
@@ -195,6 +205,9 @@ GEM
     mocha (1.13.0)
     multipart-post (2.3.0)
     nio4r (2.5.9)
+    nokogiri (1.13.10)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nokogiri (1.13.10-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.13.10-x86_64-linux)
@@ -351,19 +364,8 @@ GEM
     yajl-ruby (1.4.3)
     zeitwerk (2.6.8)
 
-GEM
-  remote: https://rubygems.pkg.github.com/epimorphics/
-  specs:
-    data_services_api (1.4.1.1)
-      faraday_middleware (~> 1.2.0)
-      json (~> 2.6.1)
-      yajl-ruby (~> 1.4.1)
-    json_rails_logger (1.0.3)
-      json
-      lograge
-      railties
-
 PLATFORMS
+  ruby
   x86_64-darwin-21
   x86_64-linux
 
diff --git a/Makefile b/Makefile
index 96d13711..dd5ab4a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .PHONY:	assets check clean image lint publish realclean run tag test vars
 
 ACCOUNT?=$(shell aws sts get-caller-identity | jq -r .Account)
-ALPINE_VERSION?=3.13
+ALPINE_VERSION?=3.16
 AWS_REGION?=eu-west-1
 BUNDLER_VERSION?=$(shell tail -1 Gemfile.lock | tr -d ' ')
 ECR?=${ACCOUNT}.dkr.ecr.eu-west-1.amazonaws.com
diff --git a/app/lib/version.rb b/app/lib/version.rb
index 011f92f0..2e2f2907 100644
--- a/app/lib/version.rb
+++ b/app/lib/version.rb
@@ -3,7 +3,7 @@
 module Version
   MAJOR = 1
   MINOR = 7
-  PATCH = 5
+  PATCH = 6
   SUFFIX = nil
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}#{SUFFIX && ".#{SUFFIX}"}"
 end

From d150c64997d0d0ebbaf346938e5ad8dc978407a7 Mon Sep 17 00:00:00 2001
From: Daniel Couzens <dan.couzens@epimorphics.com>
Date: Mon, 7 Oct 2024 14:01:11 +0100
Subject: [PATCH 2/2] updates version cadence

---
 CHANGELOG.md       | 2 +-
 app/lib/version.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70fcca3d..9611bfed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changes to the UKHPI app by version and date
 
-## 1.7.6 - 2024-10
+## 1.8.0 - 2024-10
 
 - (Dan) Updates ruby version to 2.7.8 and alpine version to 3.16 [GH-455](https://github.com/epimorphics/ukhpi/issues/455)
 
diff --git a/app/lib/version.rb b/app/lib/version.rb
index 2e2f2907..5b4aba1b 100644
--- a/app/lib/version.rb
+++ b/app/lib/version.rb
@@ -2,8 +2,8 @@
 
 module Version
   MAJOR = 1
-  MINOR = 7
-  PATCH = 6
+  MINOR = 8
+  PATCH = 0
   SUFFIX = nil
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}#{SUFFIX && ".#{SUFFIX}"}"
 end