From 0fd8224569563f4d11361ad2db80c31c67bff7ed Mon Sep 17 00:00:00 2001 From: Ben Lovell Date: Mon, 10 Jun 2024 11:40:16 +0100 Subject: [PATCH 1/8] Bump templates for link amends --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2b3b1522..76be74b6 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ source 'https://rubygems.org' do # rubocop:disable Metrics/BlockLength gem 'net-http' gem 'net-sftp' gem 'notifications-ruby-client' - gem 'output-templates', github: 'guidance-guarantee-programme/output-templates', ref: 'd5ab5a3' + gem 'output-templates', github: 'guidance-guarantee-programme/output-templates', branch: 'link-amends' gem 'pg' gem 'plek' gem 'postgres-copy' diff --git a/Gemfile.lock b/Gemfile.lock index 9c7d9ffb..c425fe03 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/guidance-guarantee-programme/output-templates.git - revision: d5ab5a3dbd057529cb0ac89a0947366e57217370 - ref: d5ab5a3 + revision: c166ecb8bfeb8c1228ca6dcfafabf0644062c8e8 + branch: link-amends specs: output-templates (6.12.0) actionview From fac388a11b0a66c335d258b2b2ec70ab4185bbef Mon Sep 17 00:00:00 2001 From: Ben Lovell Date: Mon, 10 Jun 2024 14:31:08 +0100 Subject: [PATCH 2/8] Specify chromedriver for CI --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92cef38c..344cc39f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,8 @@ before_script: - '(cd .downloads; [ -d prince-9.0r5-linux-amd64-static ] || curl -s https://www.princexml.com/download/prince-9.0r5-linux-amd64-static.tar.gz | tar xzf -)' - echo $PWD | ./.downloads/prince-9.0r5-linux-amd64-static/install.sh - npm install -- npx @puppeteer/browsers install chromedriver@123.0.6312.86 --path $PWD/bin -- export PATH=$PWD/bin/chromedriver/linux-123.0.6312.86/chromedriver-linux64:$PATH +- "npx @puppeteer/browsers install chromedriver@${CHROMEDRIVER} --path $PWD/bin" +- "export PATH=$PWD/bin/chromedriver/linux-${CHROMEDRIVER}/chromedriver-linux64:$PATH" - './bin/rake db:setup RAILS_ENV=test' notifications: slack: From 4c6a384755a266aab38746c1f937cf32e9fefa35 Mon Sep 17 00:00:00 2001 From: Ben Lovell Date: Tue, 11 Jun 2024 14:34:52 +0100 Subject: [PATCH 3/8] Bump PG --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c425fe03..0938140c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -267,7 +267,7 @@ GEM parser (3.2.2.3) ast (~> 2.4.1) racc - pg (1.5.4) + pg (1.5.6) plek (2.1.1) postgres-copy (1.4.1) activerecord (>= 5.1) From aee22f2e2cbc6214e77c1ba8fbf2e96cf5f8c606 Mon Sep 17 00:00:00 2001 From: Ben Lovell Date: Tue, 11 Jun 2024 14:37:01 +0100 Subject: [PATCH 4/8] Bump templates for further changes --- Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0938140c..e1f06ecd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/guidance-guarantee-programme/output-templates.git - revision: c166ecb8bfeb8c1228ca6dcfafabf0644062c8e8 + revision: d3376dcab0420c5807402b95e7aede8c9b449183 branch: link-amends specs: output-templates (6.12.0) @@ -106,7 +106,7 @@ GEM sass (>= 3.3.0) bugsnag (6.26.0) concurrent-ruby (~> 1.0) - builder (3.2.4) + builder (3.3.0) byebug (11.1.3) capybara (3.39.2) addressable @@ -120,7 +120,7 @@ GEM case_transform (0.2) activesupport coderay (1.1.3) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) crass (1.0.6) database_rewinder (0.9.8) @@ -180,7 +180,7 @@ GEM plek (>= 2.1.0) rails (>= 3.2.0) hashie (5.0.0) - i18n (1.14.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) @@ -218,8 +218,8 @@ GEM actionpack (>= 3.2.0, < 7.1) method_source (1.0.0) mini_mime (1.1.5) - mini_portile2 (2.8.5) - minitest (5.22.2) + mini_portile2 (2.8.7) + minitest (5.23.1) msgpack (1.7.2) multi_json (1.15.0) multi_xml (0.6.0) @@ -243,7 +243,7 @@ GEM net-protocol net-ssh (5.0.2) nio4r (2.7.0) - nokogiri (1.16.2) + nokogiri (1.16.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) notifications-ruby-client (2.6.0) @@ -283,7 +283,7 @@ GEM public_suffix (5.0.3) puma (6.4.2) nio4r (~> 2.0) - racc (1.7.3) + racc (1.8.0) rack (2.2.8.1) rack-cors (1.1.1) rack (>= 2.0.0) @@ -445,7 +445,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.13) + zeitwerk (2.6.15) PLATFORMS ruby From 1787ccc637a025eef7c6c0c84825ffcf9df9064b Mon Sep 17 00:00:00 2001 From: Ben Lovell Date: Tue, 11 Jun 2024 17:13:37 +0100 Subject: [PATCH 5/8] Bump templates for complaints changes --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e1f06ecd..66fcbd5e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/guidance-guarantee-programme/output-templates.git - revision: d3376dcab0420c5807402b95e7aede8c9b449183 + revision: 7453d2fa57f1d97f1a470eee08bd31c20bf264f3 branch: link-amends specs: output-templates (6.12.0) From df76d0c6d52c01cc5f19e017e0b25478dd8fe79d Mon Sep 17 00:00:00 2001 From: Ben Lovell Date: Wed, 12 Jun 2024 14:27:57 +0100 Subject: [PATCH 6/8] Bump templates to remove line break --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 66fcbd5e..3c18770b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/guidance-guarantee-programme/output-templates.git - revision: 7453d2fa57f1d97f1a470eee08bd31c20bf264f3 + revision: 975631651f3610c8c207900155efe6ca2fff54fc branch: link-amends specs: output-templates (6.12.0) From 03d74bcc9e73a755614fdf80b96f217799dd6e83 Mon Sep 17 00:00:00 2001 From: Ben Lovell Date: Thu, 13 Jun 2024 09:51:58 +0100 Subject: [PATCH 7/8] Resolve Travis chrome issues --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 344cc39f..8d2c3430 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ sudo: false +distro: focal language: ruby -addons: - chrome: stable services: - redis-server - postgresql From c673e74bc391781b7491f844d31549139475b936 Mon Sep 17 00:00:00 2001 From: Ben Lovell Date: Thu, 13 Jun 2024 12:56:51 +0100 Subject: [PATCH 8/8] Bump templates to released version --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 76be74b6..2e02b1f3 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ source 'https://rubygems.org' do # rubocop:disable Metrics/BlockLength gem 'net-http' gem 'net-sftp' gem 'notifications-ruby-client' - gem 'output-templates', github: 'guidance-guarantee-programme/output-templates', branch: 'link-amends' + gem 'output-templates', github: 'guidance-guarantee-programme/output-templates', ref: '719b9ee' gem 'pg' gem 'plek' gem 'postgres-copy' diff --git a/Gemfile.lock b/Gemfile.lock index 3c18770b..0b041603 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/guidance-guarantee-programme/output-templates.git - revision: 975631651f3610c8c207900155efe6ca2fff54fc - branch: link-amends + revision: 719b9ee1105b09b43784f653fbe0fa0211e85927 + ref: 719b9ee specs: output-templates (6.12.0) actionview