Skip to content

Unlock and Update dependencies #58

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

Open
wants to merge 5 commits into
base: master
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
8 changes: 4 additions & 4 deletions .github/workflows/rspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ on:
branches: [ master ]
jobs:
build:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ruby: [ 2.4, 2.5, 2.6 ]
ruby: [ 3.3, 3.4 ]
name: rspec with ruby ${{ matrix.ruby }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
bundler: 1

- run: bundle exec rspec
- run: bundle exec rspec
6 changes: 3 additions & 3 deletions fix-db-schema-conflicts.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Gem::Specification.new do |spec|

spec.add_development_dependency 'bundler'
spec.add_development_dependency 'rake'
spec.add_development_dependency 'rspec', '~>3.4.0'
spec.add_development_dependency 'rails', '~> 4.2.0'
spec.add_development_dependency 'sqlite3', '~> 1.3.0'
spec.add_development_dependency 'rspec'
spec.add_development_dependency 'rails'
spec.add_development_dependency 'sqlite3'

spec.add_dependency 'rubocop', '>= 0.38.0'

Expand Down
19 changes: 9 additions & 10 deletions spec/integration/integration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ def reference_db_schema
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
#
# Note that this schema.rb definition is the authoritative source for your
# database schema. If you need to create the application database on another
# system, you should be using db:schema:load, not running all the migrations
# from scratch. The latter is a flawed and unsustainable approach (the more migrations
# you'll amass, the slower it'll run and the greater likelihood for issues).
# This file is the source Rails uses to define your schema when running `bin/rails
# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
# be faster and is potentially less error prone than running all of your
# migrations from scratch. Old migrations may fail to apply correctly if those
# migrations use external dependencies or application code.
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20160322223258) do
ActiveRecord::Schema[8.0].define(version: 2016_03_22_223258) do
create_table "companies", force: :cascade do |t|
t.string "addr1"
t.string "addr2"
Expand All @@ -43,12 +43,11 @@ def reference_db_schema
t.string "state"
t.datetime "updated_at", null: false
t.string "zip"
t.index ["city"], name: "index_companies_on_city"
t.index ["name"], name: "index_companies_on_name"
t.index ["state"], name: "index_companies_on_state"
end

add_index "companies", ["city"], name: "index_companies_on_city"
add_index "companies", ["name"], name: "index_companies_on_name"
add_index "companies", ["state"], name: "index_companies_on_state"

create_table "people", force: :cascade do |t|
t.integer "age"
t.date "birthdate"
Expand Down
31 changes: 24 additions & 7 deletions spec/test-app/.gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,34 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'
# Temporary files generated by your text editor or operating system
# belong in git's global ignore instead:
# `$XDG_CONFIG_HOME/git/ignore` or `~/.config/git/ignore`

# Ignore bundler config.
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal
# Ignore all environment files.
/.env*

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
/tmp
!/tmp/.keep

# Ignore pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/
!/tmp/pids/.keep

# Ignore storage (uploaded files in development and any SQLite databases).
/storage/*
!/storage/.keep
/tmp/storage/*
!/tmp/storage/
!/tmp/storage/.keep

/public/assets

# Ignore master key for decrypting credentials and more.
/config/master.key
10 changes: 4 additions & 6 deletions spec/test-app/Gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
source 'https://rubygems.org'
source "https://rubygems.org"

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.5.2'
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 8.0.2"
# Use sqlite3 as the database for Active Record
gem 'sqlite3'

gem 'fix-db-schema-conflicts', path: '../..'
gem "sqlite3", ">= 2.1"
Loading