Skip to content

Commit

Permalink
Merge pull request #312 from sanger/develop
Browse files Browse the repository at this point in the history
Release samples_extraction with ruby 3.1.4
  • Loading branch information
yoldas authored Apr 16, 2024
2 parents 8ab9f6d + 621ae54 commit 468ed72
Show file tree
Hide file tree
Showing 138 changed files with 3,049 additions and 4,372 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"presets": ["@babel/preset-env", "@babel/preset-react"],
"plugins": ["@babel/plugin-syntax-dynamic-import", "@babel/plugin-proposal-object-rest-spread"]
"plugins": ["@babel/plugin-syntax-dynamic-import"]
}
2 changes: 1 addition & 1 deletion .release-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.4
2.2.5
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ AllCops:
Metrics/BlockLength:
Exclude:
- Gemfile
IgnoredMethods:
AllowedMethods:
- describe
- context
- background
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.6
3.1.4
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
FROM ruby:2.7
ENV BUNDLER_VERSION=2.2.26
FROM ruby:3.1.4
RUN apt-get update -qq && apt-get install -y
# Install node and Yarn
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
RUN apt-get install -y nodejs
RUN apt-get install -y python2
RUN apt-get install -y python3
RUN npm install -g yarn
WORKDIR /samples_extraction
ADD Gemfile /samples_extraction
Expand Down
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ gem 'jsonapi-resources'

# Tools
gem 'pmb-client', git: 'https://github.com/sanger/pmb-client.git'
gem 'sanger_barcode_format', git: 'https://github.com/sanger/sanger_barcode_format.git'
gem 'sanger_barcode_format', git: 'https://github.com/sanger/sanger_barcode_format.git', branch: 'development'

# Sequencescspae
gem 'faraday'
Expand All @@ -63,15 +63,15 @@ gem 'rb-readline'
gem 'yard'

# Feature flags
gem 'flipper'
gem 'flipper-redis'
gem 'flipper-ui'
gem 'flipper', '~> 0.26.0'
gem 'flipper-active_record', '~> 0.26.0'
gem 'flipper-redis', '~> 0.26.0'
gem 'flipper-ui', '~> 0.26.0'

group :development, :test do
# Call 'pry' anywhere in the code to stop execution and get a debugger console
gem 'pry-byebug'
gem 'pry-rails'
gem 'ruby-growl'
end

group :test do
Expand Down
Loading

0 comments on commit 468ed72

Please sign in to comment.