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

Update ruby [2.7.7] / rails [6.0.6] version #1641

Merged
merged 5 commits into from
May 1, 2023
Merged
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: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
name: Deploy
runs-on: ubuntu-latest
container:
image: ruby:2.5.9-alpine3.13
image: ruby:2.7.7-alpine3.16

steps:
- name: Install dependencies
Expand All @@ -15,8 +15,8 @@ jobs:
run: |
apk add --update --no-cache $BUILD_PACKAGES

- name: Install Bundler 2.3.14
run: gem install bundler:2.3.14
- name: Install Bundler 2.3.22
run: gem install bundler:2.3.22

- name: Install node and yarn
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Release and Deploy
runs-on: ubuntu-latest
container:
image: ruby:2.5.9-alpine3.13
image: ruby:2.7.7-alpine3.16

steps:
- name: Install dependencies
Expand Down Expand Up @@ -51,8 +51,8 @@ jobs:
# pulls all commits (needed for lerna / semantic release to correctly version)
fetch-depth: "0"

- name: Install Bundler 2.3.14
run: gem install bundler:2.3.14
- name: Install Bundler 2.3.22
run: gem install bundler:2.3.22

# Setup Git Credentials to come from the Bot
- name: Set Bot Email
Expand Down
2 changes: 1 addition & 1 deletion docs/.ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.9
2.7.7
2 changes: 1 addition & 1 deletion docs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.5.9-alpine
FROM ruby:2.7.7-alpine

ARG RAILS_ENV="production"
ARG NONROOT_UID="1000"
Expand Down
8 changes: 4 additions & 4 deletions docs/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

source 'https://rubygems.org'

ruby "2.5.9"
ruby "2.7.7"

gem 'rails', '5.2.6.3'
gem 'rails', '6.0.6'

gem 'sass-rails', '~> 6.0'
gem 'uglifier', '>= 1.3.0'
gem 'webpacker', '~> 4.3', '>= 4.3.0'

Expand All @@ -28,8 +29,7 @@ group :development do

# Spring speeds up development by keeping your application running in the
# background. Read more: https://github.com/rails/spring
# Use Spring 1.3.3, Product's Spring version, to prevent needing to frequently restart Spring
gem "spring", "1.3.3"
gem "spring", "~> 2.1.1"

# CLI Version Bumping Utility
# Used by bin/sage-tag.sh to automate sage_rails version bump workflow
Expand Down
138 changes: 79 additions & 59 deletions docs/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,48 +8,61 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.6.3)
actionpack (= 5.2.6.3)
actioncable (6.0.6)
actionpack (= 6.0.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.6.3)
actionpack (= 5.2.6.3)
actionview (= 5.2.6.3)
activejob (= 5.2.6.3)
actionmailbox (6.0.6)
actionpack (= 6.0.6)
activejob (= 6.0.6)
activerecord (= 6.0.6)
activestorage (= 6.0.6)
activesupport (= 6.0.6)
mail (>= 2.7.1)
actionmailer (6.0.6)
actionpack (= 6.0.6)
actionview (= 6.0.6)
activejob (= 6.0.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.6.3)
actionview (= 5.2.6.3)
activesupport (= 5.2.6.3)
actionpack (6.0.6)
actionview (= 6.0.6)
activesupport (= 6.0.6)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.6.3)
activesupport (= 5.2.6.3)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.6)
actionpack (= 6.0.6)
activerecord (= 6.0.6)
activestorage (= 6.0.6)
activesupport (= 6.0.6)
nokogiri (>= 1.8.5)
actionview (6.0.6)
activesupport (= 6.0.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.6.3)
activesupport (= 5.2.6.3)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.6)
activesupport (= 6.0.6)
globalid (>= 0.3.6)
activemodel (5.2.6.3)
activesupport (= 5.2.6.3)
activerecord (5.2.6.3)
activemodel (= 5.2.6.3)
activesupport (= 5.2.6.3)
arel (>= 9.0)
activestorage (5.2.6.3)
actionpack (= 5.2.6.3)
activerecord (= 5.2.6.3)
marcel (~> 1.0.0)
activesupport (5.2.6.3)
activemodel (6.0.6)
activesupport (= 6.0.6)
activerecord (6.0.6)
activemodel (= 6.0.6)
activesupport (= 6.0.6)
activestorage (6.0.6)
actionpack (= 6.0.6)
activejob (= 6.0.6)
activerecord (= 6.0.6)
marcel (~> 1.0)
activesupport (6.0.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (9.0.0)
zeitwerk (~> 2.2, >= 2.2.2)
bindex (0.8.1)
builder (3.2.4)
bump (0.9.0)
Expand All @@ -59,15 +72,13 @@ GEM
concurrent-ruby (1.1.8)
crass (1.0.6)
diff-lcs (1.4.4)
digest (3.1.1)
erubi (1.10.0)
execjs (2.7.0)
ffi (1.13.1)
globalid (1.0.0)
activesupport (>= 5.0)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
io-wait (0.2.3)
kaminari (1.2.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.1)
Expand Down Expand Up @@ -98,19 +109,14 @@ GEM
mini_mime (1.1.2)
mini_portile2 (2.6.1)
minitest (5.14.4)
net-imap (0.2.2)
digest
net-imap (0.3.1)
net-protocol
strscan
net-pop (0.1.2)
net-protocol
net-protocol (0.1.1)
io-wait
net-protocol (0.2.0)
timeout
net-smtp (0.3.0)
digest
net-smtp (0.3.3)
net-protocol
timeout
nio4r (2.5.8)
nokogiri (1.12.5)
mini_portile2 (~> 2.6.1)
Expand All @@ -124,18 +130,20 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.6.3)
actioncable (= 5.2.6.3)
actionmailer (= 5.2.6.3)
actionpack (= 5.2.6.3)
actionview (= 5.2.6.3)
activejob (= 5.2.6.3)
activemodel (= 5.2.6.3)
activerecord (= 5.2.6.3)
activestorage (= 5.2.6.3)
activesupport (= 5.2.6.3)
rails (6.0.6)
actioncable (= 6.0.6)
actionmailbox (= 6.0.6)
actionmailer (= 6.0.6)
actionpack (= 6.0.6)
actiontext (= 6.0.6)
actionview (= 6.0.6)
activejob (= 6.0.6)
activemodel (= 6.0.6)
activerecord (= 6.0.6)
activestorage (= 6.0.6)
activesupport (= 6.0.6)
bundler (>= 1.3.0)
railties (= 5.2.6.3)
railties (= 6.0.6)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
Expand All @@ -147,12 +155,12 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (5.2.6.3)
actionpack (= 5.2.6.3)
activesupport (= 5.2.6.3)
railties (6.0.6)
actionpack (= 6.0.6)
activesupport (= 6.0.6)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
thor (>= 0.20.3, < 2.0)
rake (13.0.3)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
Expand All @@ -176,17 +184,27 @@ GEM
rspec-mocks (~> 3.9)
rspec-support (~> 3.9)
rspec-support (3.9.3)
spring (1.3.3)
sprockets (3.7.2)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
spring (2.1.1)
sprockets (4.1.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
strscan (3.0.4)
thor (1.1.0)
thread_safe (0.3.6)
tilt (2.0.11)
timeout (0.3.1)
tzinfo (1.2.10)
thread_safe (~> 0.1)
Expand All @@ -204,6 +222,7 @@ GEM
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.6.6)

PLATFORMS
ruby
Expand All @@ -215,19 +234,20 @@ DEPENDENCIES
listen (~> 3.5.1)
lockup (~> 1.5, >= 1.5.1)
pry
rails (= 5.2.6.3)
rails (= 6.0.6)
rails_12factor
redcarpet
rouge
rspec-rails (>= 4.0.1)
sage_rails!
spring (= 1.3.3)
sass-rails (~> 6.0)
spring (~> 2.1.1)
uglifier (>= 1.3.0)
web-console (~> 3.7, >= 3.7.0)
webpacker (~> 4.3, >= 4.3.0)

RUBY VERSION
ruby 2.5.9p229
ruby 2.7.7p221

BUNDLED WITH
2.3.14
2.3.22
3 changes: 3 additions & 0 deletions docs/app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
10 changes: 6 additions & 4 deletions docs/bin/setup
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/usr/bin/env ruby
require 'pathname'
require 'fileutils'
include FileUtils

# path to your application root.
APP_ROOT = File.expand_path('..', __dir__)
Expand All @@ -10,8 +8,9 @@ def system!(*args)
system(*args) || abort("\n== Command #{args} failed ==")
end

chdir APP_ROOT do
# This script is a starting point to setup your application.
FileUtils.chdir APP_ROOT do
# This script is a way to setup or update your development environment automatically.
# This script is idempotent, so that you can run it at anytime and get an expectable outcome.
# Add necessary setup steps to this file.

puts '== Installing dependencies =='
Expand All @@ -23,6 +22,9 @@ chdir APP_ROOT do
# cp 'config/database.yml.sample', 'config/database.yml'
# end

# Install JavaScript dependencies
# system('bin/yarn')

puts "\n== Preparing database =="
system! 'bin/rails db:setup'

Expand Down
2 changes: 1 addition & 1 deletion docs/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
module SageDocs
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 5.0
config.load_defaults 6.0

# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
Expand Down
5 changes: 5 additions & 0 deletions docs/config/initializers/content_security_policy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
# policy.object_src :none
# policy.script_src :self, :https
# policy.style_src :self, :https
# # If you are using webpack-dev-server then specify webpack-dev-server host
# policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?

# # Specify URI for violation reports
# # policy.report_uri "/csp-violation-report-endpoint"
Expand All @@ -19,6 +21,9 @@
# If you are using UJS then enable automatic nonce generation
# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }

# Set the nonce only to specific directives
# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)

# Report CSP violations to a specified URI
# For further information see the following documentation:
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
Expand Down
Loading