Skip to content

Commit

Permalink
Merge pull request #18 from nfdi4health/17-merge-seek-1.13-seek_custo…
Browse files Browse the repository at this point in the history
…m_metadata

17 merge seek 1.13 seek custom metadata
  • Loading branch information
ReneHaensel authored Jul 7, 2023
2 parents 6a1f31e + 6f7c4ab commit 494d190
Show file tree
Hide file tree
Showing 124 changed files with 3,160 additions and 442 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,25 +59,23 @@ jobs:
suite: rails test test/unit
steps:
- name: Install system dependencies
run: sudo apt update && sudo apt install -y graphicsmagick graphviz libcurl4-gnutls-dev libreoffice poppler-utils
# build-essential git imagemagick libgmp-dev \
# libmagick++-dev libmysqlclient-dev libpq-dev libreadline-dev libreoffice libssl-dev \
# libxml++2.6-dev libxslt1-dev nodejs openjdk-8-jdk openssh-server poppler-utils zip
run: |
sudo apt install -y software-properties-common
sudo add-apt-repository ppa:deadsnakes/ppa
sudo apt update
sudo apt install -y graphicsmagick graphviz libcurl4-gnutls-dev libreoffice poppler-utils build-essential \
git imagemagick libgmp-dev python3.7-dev python3.7-distutils python3-pip
- name: Checkout code
uses: actions/checkout@v3
- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: 'temurin'
distribution: 'temurin'
java-version: '11' # The JDK version to make available on the path.
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.7'
- name: Cache pip
uses: actions/cache@v3
with:
Expand All @@ -89,7 +87,9 @@ jobs:
${{ runner.os }}-pip-
${{ runner.os }}-
- name: Install Python dependencies
run: pip install -r requirements.txt
run: |
python3.7 -m pip install setuptools==58
python3.7 -m pip install -r requirements.txt
- name: Create test database
run: |
cp test/config/database.github.${{ matrix.database }}.yml config/database.yml
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.7.7
ruby-2.7.8
49 changes: 0 additions & 49 deletions .travis.yml

This file was deleted.

5 changes: 5 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,11 @@ gem 'remotipart', '~> 1.4.4' # Allows file upload in AJAX forms

gem 'rails-static-router'

# to avoid warnings after rails 6.1.7.2 update - see https://github.com/ruby/net-imap/issues/16
gem "net-http"
gem "net-ftp"
gem "uri", "0.10.0.2"

group :production do
gem 'passenger'
end
Expand Down
Loading

0 comments on commit 494d190

Please sign in to comment.