Merge remote-tracking branch 'Seek-1.14/seek-1.15' into merge-seek1.1…

…5-into-LDH

.github/workflows/ansible-install.yml

@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure ansible for local install
         working-directory: /home/runner/work/seek/seek/script/ansible/

.github/workflows/docker-image.yml

@@ -10,11 +10,8 @@ on:
       - main
       - workflow
       - workflowhub
-      - seek-1.11
-      - seek-1.12
-      - seek-1.13
-      - master-ibisba-demonstrator
-      - ruby-3
+      - full-test-suite
+
   pull_request:
 
 jobs:
@@ -23,25 +20,6 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - id: generate-image-tag
-        name: Generate Image Tag
-        env:
-          ref_name: "${{ github.ref_name }}"
-          head_ref: "${{ github.head_ref }}"
-        run: |
-          ref_name="${head_ref:-${ref_name/main/latest}}"
-          echo "::set-output name=imageTag::${ref_name#v}"
-      - name: Login to Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and Push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          push: true
-          tags: ghcr.io/${{ github.repository }}:${{ steps.generate-image-tag.outputs.imageTag }}
+      - uses: actions/checkout@v4
+      - name: Build the Docker image
+        run: docker build . --file Dockerfile --tag test-image:$(date +%s)

.github/workflows/tests.yml

@@ -66,9 +66,9 @@ jobs:
           sudo apt install -y graphicsmagick graphviz libcurl4-gnutls-dev libreoffice poppler-utils build-essential \
             git imagemagick libgmp-dev python3.9-dev python3.9-distutils python3-pip
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11' # The JDK version to make available on the path.
@@ -77,7 +77,7 @@ jobs:
         with:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: Cache pip
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           # This path is specific to Ubuntu
           path: ~/.cache/pip

Gemfile

@@ -15,7 +15,7 @@ gem 'hpricot', '~>0.8.2'
 gem 'libxml-ruby', '~>2.9.0', require: 'libxml'
 gem 'uuid', '~>2.3'
 gem 'RedCloth', '>=4.3.0'
-gem 'simple-spreadsheet-extractor', '~> 0.18.0'
+gem 'simple-spreadsheet-extractor', '0.18.1'
 gem 'open4'
 gem 'sample-template-generator', '~>0.7'
 gem 'rmagick', '5.3.0'
@@ -54,14 +54,14 @@ gem 'will_paginate', '~> 3.1'
 gem 'yaml_db'
 gem 'rails_autolink'
 gem 'rfc-822'
-gem 'nokogiri', '~> 1.14.3'
+gem 'nokogiri', '~> 1.16.2'
 #necessary for newer hashie dependency, original api_smith is no longer active
 gem 'api_smith', git: 'https://github.com/youroute/api_smith.git', ref: '1fb428cebc17b9afab25ac9f809bde87b0ec315b'
 gem 'rdf-virtuoso', '>= 0.2.0'
 gem 'terrapin'
 gem 'lograge'
 gem 'psych'
-gem 'stringio', '3.0.1' #locked to the default version for ruby 3.1
+gem 'stringio', '3.0.1.1' #locked to the default version for ruby 3.1
 gem 'validate_url'
 gem "attr_encrypted", "~> 3.0.0"
 gem 'libreconv'
@@ -163,6 +163,8 @@ gem 'net-ftp'
 
 gem 'licensee'
 
+gem "sitemap_generator", "~> 6.3"
+
 group :production do
   gem 'passenger'
 end
@@ -207,5 +209,3 @@ group :test, :development do
   gem 'teaspoon'
   gem 'teaspoon-mocha'
 end
-
-gem "sitemap_generator", "~> 6.3"