From 4700fba958a54dd5b13f11a544eadb745c82f51b Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Thu, 6 Jun 2024 15:12:12 +0100 Subject: [PATCH] TEMP: Test branch of the publishing components gem --- Gemfile | 2 +- Gemfile.lock | 26 ++++++++++++++++---------- startup.sh | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 5eb74850e..d0e84c2ab 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem "govspeak" gem "govuk_ab_testing" gem "govuk_app_config" gem "govuk_document_types" -gem "govuk_publishing_components" +gem "govuk_publishing_components", git: "https://github.com/alphagov/govuk_publishing_components.git", branch: "upgrade-to-govuk-frontend-5.1" gem "plek" gem "rails-i18n" gem "rails_translation_manager" diff --git a/Gemfile.lock b/Gemfile.lock index 88cfed98a..759477e07 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,18 @@ +GIT + remote: https://github.com/alphagov/govuk_publishing_components.git + revision: 02d2ef7e6c9dcc6160ce818baed4c0c13e0052f3 + branch: upgrade-to-govuk-frontend-5.1 + specs: + govuk_publishing_components (38.4.1) + govuk_app_config + govuk_personalisation (>= 0.7.0) + kramdown + plek + rails (>= 6) + rouge + sprockets (>= 3) + sprockets-rails + GEM remote: https://rubygems.org/ specs: @@ -213,15 +228,6 @@ GEM govuk_personalisation (0.16.0) plek (>= 1.9.0) rails (>= 6, < 8) - govuk_publishing_components (38.4.1) - govuk_app_config - govuk_personalisation (>= 0.7.0) - kramdown - plek - rails (>= 6) - rouge - sprockets (>= 3) - sprockets-rails govuk_schemas (5.0.2) json-schema (>= 2.8, < 4.4) govuk_test (4.1.0) @@ -786,7 +792,7 @@ DEPENDENCIES govuk_ab_testing govuk_app_config govuk_document_types - govuk_publishing_components + govuk_publishing_components! govuk_schemas govuk_test i18n-coverage diff --git a/startup.sh b/startup.sh index 1ecf0cf52..1af8c08c0 100755 --- a/startup.sh +++ b/startup.sh @@ -7,7 +7,7 @@ if [[ $1 == "--live" ]] ; then GOVUK_WEBSITE_ROOT=https://www.gov.uk \ GOVUK_PROXY_STATIC_ENABLED=true \ PLEK_SERVICE_CONTENT_STORE_URI=${PLEK_SERVICE_CONTENT_STORE_URI-https://www.gov.uk/api} \ - PLEK_SERVICE_STATIC_URI=${PLEK_SERVICE_STATIC_URI-https://assets.publishing.service.gov.uk} \ + PLEK_SERVICE_STATIC_URI=${PLEK_SERVICE_STATIC_URI-http://static.dev.gov.uk} \ PLEK_SERVICE_SEARCH_API_URI=${PLEK_SERVICE_SEARCH_API_URI-https://www.gov.uk/api} \ ./bin/dev else