Skip to content

Commit

Permalink
Merge pull request #358 from sanger/develop
Browse files Browse the repository at this point in the history
Develop -> Master
  • Loading branch information
BenTopping authored Sep 17, 2024
2 parents c10f2ae + 8114e6f commit edf911d
Show file tree
Hide file tree
Showing 16 changed files with 1,086 additions and 378 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/assign_issue_number.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Assign Issue Number

on:
issues:
types: [opened]

jobs:
call-add-to-project:
uses: sanger/.github/.github/workflows/generate_issue_number.yml@master
secrets:
app_id: ${{ secrets.ISSUE_GEN_APP_ID }}
app_key: ${{ secrets.ISSUE_GEN_APP_KEY }}
2 changes: 1 addition & 1 deletion .release-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.5
2.2.6
2 changes: 2 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ require:

AllCops:
NewCops: enable
SuggestExtensions: false
inherit_mode:
merge:
- Exclude
Exclude:
- 'db/views_schema.rb'
- db/migrate/*

# Blocks are used to structure tests and are part of the rspec dsl.
# The standard BlockLength limits are too stringent for this purpose.
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.4
3.3.5
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1.4
FROM ruby:3.3.5
RUN apt-get update -qq && apt-get install -y
# Install node and Yarn
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
Expand All @@ -10,14 +10,14 @@ ADD Gemfile /samples_extraction
ADD Gemfile.lock /samples_extraction
ADD package.json /samples_extraction
ADD yarn.lock /samples_extraction
RUN gem install bundler -v 2.2.26
RUN gem install bundler -v 2.5.18
RUN bundle install --jobs=5 --deployment --without development test
RUN yarn install

ADD . /samples_extraction/

# Compiling assets
RUN SE_REDIS_URI= SECRET_KEY_BASE=`bin/rake secret` WARREN_TYPE=log RAILS_ENV=production bundle exec rake assets:precompile
RUN SE_REDIS_URI= SECRET_KEY_BASE=`bin/rails secret` WARREN_TYPE=log RAILS_ENV=production bundle exec rake assets:precompile

# Generating sha
RUN git rev-parse HEAD > REVISION
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gem 'aasm'
gem 'activerecord-import'
gem 'activerecord-session_store'
gem 'micro_token'
gem 'rails', '~> 6.1'
gem 'rails', '~> 7.0'
gem 'tzinfo-data'

# Rails views and UI
Expand Down
Loading

0 comments on commit edf911d

Please sign in to comment.