Merge pull request #3759 from ONSdigital/feature-2.3.0-upgrade

Feature 2.3.0 upgrade

.github/workflows/deploy-feature-branch.yml

@@ -23,10 +23,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Set up Ruby 2.6
+      - name: Set up Ruby 3.2
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6'
+          ruby-version: '3.2'
       - name: Inject slug/short variables
         uses: rlespinasse/[email protected]
       - name: Update the baseurl

.github/workflows/deploy-to-production.yml

@@ -33,10 +33,10 @@ jobs:
       uses: actions/checkout@v2
       with:
         persist-credentials: false
-    - name: Set up Ruby 2.6
+    - name: Set up Ruby 3.2
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.6'
+        ruby-version: '3.2'
     - name: Build the site
       run: |
         gem install bundler -v 2.4.22

.github/workflows/deploy-to-staging.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6
+    - name: Set up Ruby 3.2
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.6'
+        ruby-version: '3.2'
     - name: Build the site
       run: |
         gem install bundler -v 2.4.22

.github/workflows/test-pull-requests.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6
+    - name: Set up Ruby 3.2
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.6'
+        ruby-version: '3.2'
     - name: Build the site
       run: |
         gem install bundler -v 2.4.22

Gemfile

@@ -1,9 +1,11 @@
 source "https://rubygems.org"
 
-gem "jekyll", "3.8.5"
+gem "jekyll", "3.9.3"
 gem "html-proofer", "3.19.4"
 gem "jekyll-remote-theme"
 gem "deep_merge"
-gem "jekyll-open-sdg-plugins", "2.2.0"
+gem "jekyll-open-sdg-plugins", "2.3.0"
 gem "jekyll-redirect-from"
 gem "jekyll-toc"
+gem "kramdown-parser-gfm"
+gem "webrick"

_config.yml

@@ -1,7 +1,7 @@
 # Jekyll configuration for Open SDG platform
 
 # Tell the Remote Theme plugin to use the Open SDG platform (Jekyll theme).
-remote_theme: open-sdg/open-sdg@2.2.0
+remote_theme: open-sdg/open-sdg@2.3.0
 
 #UK-specific config settings
 survey_url: https://www.smartsurvey.co.uk/s/EZZRYJ/

_data/site_config.yml

@@ -628,6 +628,7 @@ reporting_status:
     - value: notstarted
       label: status.no_data_available
       hide_on_goal_pages: false
+  disaggregation_indicator_count_label: indicators in scope
 repository_url_data: 'https://github.com/ONSdigital/sdg-data'
 repository_url_site: 'https://github.com/ONSdigital/sdg-indicators'
 search_index_boost: []
@@ -645,6 +646,7 @@ time_series_attributes:
     label: indicator.footnote
   - field: DATA_LAST_UPDATE
     label: metadata_fields.national_data_update_url
+use_new_config_forms: true
 validate_indicator_config: false
 validate_site_config: false
 x_axis_label: ''