Skip to content

Commit

Permalink
ci
Browse files Browse the repository at this point in the history
  • Loading branch information
@rromanchuk
rromanchuk committed Jan 10, 2025
1 parent c61c985 commit b2dce47
Show file tree
Hide file tree
Showing 18 changed files with 425 additions and 439 deletions.
12 changes: 6 additions & 6 deletions personal/Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby "3.4.1"

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 7.2"
gem "rails", "~> 8.0.0"

# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem "sprockets-rails"
Expand All @@ -20,7 +20,7 @@ gem 'puma', github: 'puma/puma'

# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
gem "importmap-rails"
gem "cssbundling-rails", "~> 1.1"
gem "cssbundling-rails"

# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
gem "turbo-rails"
Expand Down Expand Up @@ -78,7 +78,7 @@ gem "webauthn"


# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
gem "image_processing", "~> 1.2"
gem "image_processing" #, "~> 1.2"

group :development, :test do
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
Expand Down Expand Up @@ -112,8 +112,8 @@ end



gem "pagy", "~> 6.0.4"
gem 'activerecord-postgis-adapter'
gem "pagy"
#gem 'activerecord-postgis-adapter'
gem 'httparty'
gem "pghero"
gem "pg_query"
Expand All @@ -123,6 +123,6 @@ gem 'ox', require: false

gem "solid_cache", "~> 1.0"

gem "sqlite3", "~> 2.3"
gem "sqlite3"

gem "solid_cable", "~> 3.0"
130 changes: 61 additions & 69 deletions personal/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,69 +28,65 @@ GEM
specs:
action_policy (0.7.3)
ruby-next-core (>= 1.0)
actioncable (7.2.2.1)
actionpack (= 7.2.2.1)
activesupport (= 7.2.2.1)
actioncable (8.0.1)
actionpack (= 8.0.1)
activesupport (= 8.0.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.2.2.1)
actionpack (= 7.2.2.1)
activejob (= 7.2.2.1)
activerecord (= 7.2.2.1)
activestorage (= 7.2.2.1)
activesupport (= 7.2.2.1)
actionmailbox (8.0.1)
actionpack (= 8.0.1)
activejob (= 8.0.1)
activerecord (= 8.0.1)
activestorage (= 8.0.1)
activesupport (= 8.0.1)
mail (>= 2.8.0)
actionmailer (7.2.2.1)
actionpack (= 7.2.2.1)
actionview (= 7.2.2.1)
activejob (= 7.2.2.1)
activesupport (= 7.2.2.1)
actionmailer (8.0.1)
actionpack (= 8.0.1)
actionview (= 8.0.1)
activejob (= 8.0.1)
activesupport (= 8.0.1)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.2.2.1)
actionview (= 7.2.2.1)
activesupport (= 7.2.2.1)
actionpack (8.0.1)
actionview (= 8.0.1)
activesupport (= 8.0.1)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4, < 3.2)
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actiontext (7.2.2.1)
actionpack (= 7.2.2.1)
activerecord (= 7.2.2.1)
activestorage (= 7.2.2.1)
activesupport (= 7.2.2.1)
actiontext (8.0.1)
actionpack (= 8.0.1)
activerecord (= 8.0.1)
activestorage (= 8.0.1)
activesupport (= 8.0.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.2.2.1)
activesupport (= 7.2.2.1)
actionview (8.0.1)
activesupport (= 8.0.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.2.2.1)
activesupport (= 7.2.2.1)
activejob (8.0.1)
activesupport (= 8.0.1)
globalid (>= 0.3.6)
activemodel (7.2.2.1)
activesupport (= 7.2.2.1)
activerecord (7.2.2.1)
activemodel (= 7.2.2.1)
activesupport (= 7.2.2.1)
activemodel (8.0.1)
activesupport (= 8.0.1)
activerecord (8.0.1)
activemodel (= 8.0.1)
activesupport (= 8.0.1)
timeout (>= 0.4.0)
activerecord-postgis-adapter (10.0.1)
activerecord (~> 7.2.0)
rgeo-activerecord (~> 8.0.0)
activestorage (7.2.2.1)
actionpack (= 7.2.2.1)
activejob (= 7.2.2.1)
activerecord (= 7.2.2.1)
activesupport (= 7.2.2.1)
activestorage (8.0.1)
actionpack (= 8.0.1)
activejob (= 8.0.1)
activerecord (= 8.0.1)
activesupport (= 8.0.1)
marcel (~> 1.0)
activesupport (7.2.2.1)
activesupport (8.0.1)
base64
benchmark (>= 0.3)
bigdecimal
Expand All @@ -102,6 +98,7 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
aes_key_wrap (1.1.0)
Expand Down Expand Up @@ -311,7 +308,7 @@ GEM
ostruct (0.6.1)
ox (2.14.19)
bigdecimal (>= 3.0)
pagy (6.0.4)
pagy (9.3.3)
parallel (1.26.3)
parser (3.3.6.0)
ast (~> 2.4.1)
Expand All @@ -338,20 +335,20 @@ GEM
rack (>= 1.3)
rackup (2.2.1)
rack (>= 3)
rails (7.2.2.1)
actioncable (= 7.2.2.1)
actionmailbox (= 7.2.2.1)
actionmailer (= 7.2.2.1)
actionpack (= 7.2.2.1)
actiontext (= 7.2.2.1)
actionview (= 7.2.2.1)
activejob (= 7.2.2.1)
activemodel (= 7.2.2.1)
activerecord (= 7.2.2.1)
activestorage (= 7.2.2.1)
activesupport (= 7.2.2.1)
rails (8.0.1)
actioncable (= 8.0.1)
actionmailbox (= 8.0.1)
actionmailer (= 8.0.1)
actionpack (= 8.0.1)
actiontext (= 8.0.1)
actionview (= 8.0.1)
activejob (= 8.0.1)
activemodel (= 8.0.1)
activerecord (= 8.0.1)
activestorage (= 8.0.1)
activesupport (= 8.0.1)
bundler (>= 1.15.0)
railties (= 7.2.2.1)
railties (= 8.0.1)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
Expand All @@ -363,9 +360,9 @@ GEM
json (>= 1.7, < 3)
rails
rubyzip (~> 2)
railties (7.2.2.1)
actionpack (= 7.2.2.1)
activesupport (= 7.2.2.1)
railties (8.0.1)
actionpack (= 8.0.1)
activesupport (= 8.0.1)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
Expand All @@ -390,10 +387,6 @@ GEM
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.4.0)
rgeo (3.0.1)
rgeo-activerecord (8.0.0)
activerecord (>= 7.0)
rgeo (>= 3.0)
rubocop (1.69.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
Expand Down Expand Up @@ -526,7 +519,6 @@ PLATFORMS

DEPENDENCIES
action_policy
activerecord-postgis-adapter
auto_strip_attributes
awesome_print
aws-sdk-cognitoidentityprovider
Expand All @@ -536,15 +528,15 @@ DEPENDENCIES
bullet
capybara
cognito_token_verifier!
cssbundling-rails (~> 1.1)
cssbundling-rails
debug
down
friendly_id
gutentag
high_voltage
hiredis
httparty
image_processing (~> 1.2)
image_processing
importmap-rails
jbuilder
jwt
Expand All @@ -554,13 +546,13 @@ DEPENDENCIES
oauth2
oj
ox
pagy (~> 6.0.4)
pagy
pg
pg_query
pg_search
pghero
puma!
rails (~> 7.2)
rails (~> 8.0.0)
rails_real_favicon
redis
rubocop
Expand All @@ -576,7 +568,7 @@ DEPENDENCIES
solid_cable (~> 3.0)
solid_cache (~> 1.0)
sprockets-rails
sqlite3 (~> 2.3)
sqlite3
stimulus-rails
turbo-rails
tzinfo-data
Expand Down
13 changes: 5 additions & 8 deletions personal/bin/setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
require "fileutils"

APP_ROOT = File.expand_path("..", __dir__)
APP_NAME = "personal"

def system!(*args)
system(*args, exception: true)
Expand All @@ -14,7 +13,6 @@ FileUtils.chdir APP_ROOT do
# Add necessary setup steps to this file.

puts "== Installing dependencies =="
system! "gem install bundler --conservative"
system("bundle check") || system!("bundle install")

# puts "\n== Copying sample files =="
Expand All @@ -28,10 +26,9 @@ FileUtils.chdir APP_ROOT do
puts "\n== Removing old logs and tempfiles =="
system! "bin/rails log:clear tmp:clear"

puts "\n== Restarting application server =="
system! "bin/rails restart"

# puts "\n== Configuring puma-dev =="
# system "ln -nfs #{APP_ROOT} ~/.puma-dev/#{APP_NAME}"
# system "curl -Is https://#{APP_NAME}.test/up | head -n 1"
unless ARGV.include?("--skip-server")
puts "\n== Starting development server =="
STDOUT.flush # flush the output before exec(2) so that it displays
exec "bin/dev"
end
end
10 changes: 1 addition & 9 deletions personal/config/application.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

require "rails/all"


# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
Bundler.require(*Rails.groups)
Expand All @@ -12,12 +11,10 @@ class Application < Rails::Application
require "utils/formatters/json"
require "utils/formatters/lograge"
require "custom_logger"
ActiveRecord::Tasks::DatabaseTasks.structure_dump_flags = ['--clean', '--if-exists']
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 7.2
config.active_record.schema_format = :ruby
config.active_record.dump_schemas = :all

config.generators do |g|
g.orm :active_record, primary_key_type: :uuid
end
Expand All @@ -27,12 +24,6 @@ class Application < Rails::Application
# Common ones are `templates`, `generators`, or `middleware`, for example.
config.autoload_lib(ignore: %w[assets tasks])



config.assets.gzip = false
config.active_job.queue_adapter = :sidekiq


# Configuration for the application, engines, and railties goes here.
#
# These settings can be overridden in specific environments using the files
Expand All @@ -44,5 +35,6 @@ class Application < Rails::Application
end
end


Credentials = Rails.application.credentials.config[Rails.env.to_sym]
HOSTNAME = Socket.gethostname || 'unknown host'
Loading

0 comments on commit b2dce47

Please sign in to comment.