Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unified changes from all open PRs #1037

Open
wants to merge 17 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
use_devbox() {
watch_file devbox.json
eval $(devbox shell --print-env)
}

# use devbox
14 changes: 10 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,26 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ['2.7']
ruby: ['2.7.6']

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
bundler-cache: false

- name: Update RubyGems and install dependencies
run: |
gem update --system 3.3.22
bundle config set --local force_ruby_platform true
bundle install --jobs 4 --retry 3

- name: Run Tests
run: bundle exec rspec

- name: Rubocop
run: bundle exec rubocop
run: bundle exec rubocop
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
8 changes: 1 addition & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,7 @@
.DS_Store
.bundle
.gems
.rbenv-version
.ruby-*
/.idea/
/.rbx
/.rvmrc
/.yardoc/*
/Gemfile.lock
/out
/coverage/*
/dist
/doc/*
Expand Down
11 changes: 11 additions & 0 deletions .gitpod.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM gitpod/workspace-full
USER gitpod

# Install Ruby version 2.7.6 and set it as default
RUN _ruby_version=ruby-2.7.6 \
&& printf "rvm_gems_path=/home/gitpod/.rvm\n" > ~/.rvmrc \
&& bash -lc "rvm reinstall ${_ruby_version} && \
rvm use ${_ruby_version} --default" \
&& printf "rvm_gems_path=/workspace/.rvm" > ~/.rvmrc \
&& printf "{ rvm use \$(rvm current); } >/dev/null 2>&1\n" >> "$HOME/.bashrc.d/70-ruby"

20 changes: 20 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
image:
file: .gitpod.Dockerfile

github:
prebuilds:
develop: true
# enable for pull requests coming from this repo (defaults to true)
pullRequests: true

# add a "Review in Gitpod" button as a comment to pull requests (defaults to true)
addComment: true

# add a "Review in Gitpod" button to pull requests (defaults to false)
addBadge: true

# add a label once the prebuild is ready to pull requests (defaults to false)
addLabel: prebuilt-in-gitpod

tasks:
- init: bundle install
6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

98 changes: 98 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .rbenv-gemsets

This file was deleted.

8 changes: 8 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,15 @@ AllCops:
- 'tmp/**/*'
- 'spec/integration/**/*'
NewCops: enable
TargetRubyVersion: 2.7

Lint/FormatParameterMismatch:
Enabled: false

Metrics/BlockLength:
Exclude:
- 'spec/**/*.rb'

Metrics/ClassLength:
Exclude:
- 'lib/annotate/annotate_models.rb'
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.7.6
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 2.7.3
ruby 2.7.7
14 changes: 4 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
source 'https://rubygems.org'

ruby '>= 2.4.0'
ruby '>= 2.7.6'

gem 'activerecord', '>= 4.2.5', '< 6', require: false
gem 'activerecord', '>= 4.2.5', require: false
gem 'rake', require: false

group :development do
gem 'bump'
gem 'mg', require: false
gem 'travis', require: false
platforms :mri, :mingw do
gem 'yard', require: false
end
Expand All @@ -19,17 +18,13 @@ group :development, :test do
gem 'guard-rspec', require: false
gem 'rspec', require: false

gem 'rubocop', '~> 1.12.0', require: false
gem 'rubocop', '~> 1.59.0', require: false
gem 'rubocop-rake', require: false
gem 'rubocop-rspec', '~> 2.2.0', require: false
gem 'rubocop-rspec', '~> 2.25.0', require: false
gem 'simplecov', require: false
gem 'terminal-notifier-guard', require: false

gem 'codeclimate-test-reporter'
gem 'coveralls'

gem 'overcommit'
gem 'ruby_dep', '1.5.0'

platforms :mri, :mingw do
gem 'pry', require: false
Expand All @@ -38,6 +33,5 @@ group :development, :test do
end

group :test do
gem 'files', require: false
gem 'git', require: false
end
Loading
Loading