Skip to content

Commit

Permalink
Merge pull request #680 from coopdevs/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
markets authored Apr 2, 2023
2 parents 5ffa624 + e6208cf commit 2157c4d
Show file tree
Hide file tree
Showing 103 changed files with 1,840 additions and 665 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: CI

on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-latest
services:
postgres:
image: postgres:9.4
ports: ["5432:5432"]
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: timeoverflow_test
steps:
- uses: actions/checkout@v3
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- name: Run tests
env:
RAILS_ENV: test
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
run: |
bundle exec rails db:setup
bundle exec rspec
- name: Publish code coverage
uses: paambaati/[email protected]
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
with:
coverageLocations: ${{ github.workspace }}/coverage/coverage.json:simplecov
21 changes: 0 additions & 21 deletions .travis.yml

This file was deleted.

17 changes: 8 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
source 'https://rubygems.org'

ruby File.read('.ruby-version').strip

gem 'rails', '~> 6.1.1'
gem 'rails-i18n', '~> 6.0.0'
gem 'rdiscount', '~> 2.2.0.1'
gem 'rdiscount', '~> 2.2.7'
gem 'rubyzip', '~> 2.3.0'
gem 'activeadmin', '~> 2.9.0'
gem 'bootsnap', '~> 1.7.3', require: false
gem 'bootsnap', '~> 1.12.0', require: false
gem 'has_scope', '~> 0.7.2'
gem 'pundit', '~> 2.1.0'
gem 'pg', '~> 1.2.1'
gem 'pg', '~> 1.4'
gem 'json_translate', '~> 4.0.0'
gem 'devise', '~> 4.7.1'
gem 'devise', '~> 4.9.1'
gem 'devise-i18n', '~> 1.11.0'
gem 'http_accept_language', '~> 2.1.1'
gem 'unicorn', '~> 5.5.1'
gem 'kaminari', '~> 1.2.1'
Expand All @@ -22,10 +21,10 @@ gem 'prawn', '~> 2.4.0'
gem 'prawn-table', '~> 0.2.2'
gem 'pg_search', '~> 2.3.5'
gem 'skylight', '~> 5.0'
gem 'sidekiq', '~> 6.1.2'
gem 'sidekiq', '~> 6.4.0'
gem 'sidekiq-cron', '~> 1.2.0'
gem 'aws-sdk-s3', '~> 1.94', require: false
gem 'image_processing', '~> 1.2'
gem 'image_processing', '~> 1.12'

# Assets
gem 'jquery-rails', '~> 4.3.5'
Expand All @@ -36,7 +35,7 @@ gem 'select2-rails', '~> 4.0.13'

group :development do
gem 'listen', '~> 3.2.0'
gem 'localeapp', '~> 3.1', require: false
gem 'localeapp', '~> 3.3', require: false
gem 'letter_opener', '~> 1.7.0'
gem 'web-console', '~> 4.1.0'
gem 'capistrano', '~> 3.1'
Expand Down
Loading

0 comments on commit 2157c4d

Please sign in to comment.