Skip to content

Commit

Permalink
Merge pull request #4 from zooniverse/update-talk-api-version-gemspec
Browse files Browse the repository at this point in the history
Rails 5 Upgrade - Update restpack_serializer.gemspec
  • Loading branch information
yuenmichelle1 authored Aug 2, 2024
2 parents 637aaaf + ef2c409 commit 99089a6
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 7 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/run_tests_CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby

name: Ruby

on:
pull_request:
push: { branches: talk-api-version }

permissions:
contents: read

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
ruby-version: ['2.6']

steps:
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}
bundler-cache: true
- name: Run tests
run: bundle exec rake test
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0-p353
2.6
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.5
FROM ruby:2.6

RUN apt-get update && apt-get install -y nano vim

Expand Down
10 changes: 5 additions & 5 deletions restpack_serializer.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ Gem::Specification.new do |gem|
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
gem.require_paths = ["lib"]

gem.add_dependency 'activesupport', ['>= 4.0.3', '< 6.0']
gem.add_dependency 'activerecord', ['>= 4.0.3', '< 6.0']
gem.add_dependency 'activesupport', ['>= 5.0.0', '< 7.1']
gem.add_dependency 'activerecord', ['>= 5.0.0', '< 7.1']
gem.add_dependency 'kaminari', '< 2.0'

gem.add_development_dependency 'restpack_gem', '~> 0.0.9'
gem.add_development_dependency 'rake', '~> 10.0.3'
gem.add_development_dependency 'guard-rspec', '~> 2.5.4'
gem.add_development_dependency 'factory_girl', '~> 4.2.0'
gem.add_development_dependency 'sqlite3', '~> 1.3.7'
gem.add_development_dependency 'factory_girl'
gem.add_development_dependency 'sqlite3', '< 1.6'
gem.add_development_dependency 'database_cleaner', '~> 1.0.1'
gem.add_development_dependency 'rspec'
gem.add_development_dependency 'bump'
gem.add_development_dependency 'protected_attributes', '~> 1.0.5'
gem.add_development_dependency 'protected_attributes_continued'
end
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require 'rspec'
require 'ostruct'
require './lib/restpack_serializer'
require './spec/fixtures/db'
require './spec/fixtures/serializers'
Expand Down

0 comments on commit 99089a6

Please sign in to comment.