Skip to content

Commit

Permalink
Merge branch 'main' into full-test-suite
Browse files Browse the repository at this point in the history
  • Loading branch information
stuzart committed Mar 19, 2024
2 parents f99c3e9 + 8ea97d3 commit 9eb7344
Show file tree
Hide file tree
Showing 252 changed files with 8,607 additions and 1,020 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ansible-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,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:
Expand All @@ -20,6 +17,6 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Build the Docker image
run: docker build . --file Dockerfile --tag test-image:$(date +%s)
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,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.
Expand All @@ -74,7 +74,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
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -52,7 +52,7 @@ 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'
Expand Down
Loading

0 comments on commit 9eb7344

Please sign in to comment.