Skip to content

Commit

Permalink
[chore] Updating deps (#513)
Browse files Browse the repository at this point in the history
Co-authored-by: Carlos Herrera <[email protected]>
  • Loading branch information
malparty and Carlos Herrera authored Jun 12, 2024
1 parent 90db678 commit 1fa47e9
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 232 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test_generated_app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ env:
DOCKER_REGISTRY_HOST: ${{ secrets.DOCKER_REGISTRY_HOST }}
DOCKER_REGISTRY_USERNAME: ${{ github.repository_owner }}
DOCKER_REGISTRY_TOKEN: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
RUBY_VERSION: 3.2.2
NODE_VERSION: 18
RAILS_VERSION: 7.1.2
RUBY_VERSION: 3.3.1
NODE_VERSION: 22
RAILS_VERSION: 7.1.3

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_production_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ env:
APP_NAME: rails-templates
DOCKER_IMAGE: ${{ github.repository }}
DOCKER_REGISTRY_HOST: ${{ secrets.DOCKER_REGISTRY_HOST }}
RUBY_VERSION: 3.2.2
NODE_VERSION: 18
RAILS_VERSION: 7.1.2
RUBY_VERSION: 3.3.1
NODE_VERSION: 22
RAILS_VERSION: 7.1.3

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Test the codebase of the template
on: push

env:
RUBY_VERSION: 3.2.2
RUBY_VERSION: 3.3.1

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .template/addons/docker/docker-compose.dev.yml.tt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.2'
version: '3.8'

services:
db:
Expand Down
2 changes: 1 addition & 1 deletion .template/addons/docker/docker-compose.test.yml.tt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.2'
version: '3.8'

services:
db:
Expand Down
3 changes: 2 additions & 1 deletion .template/addons/docker/docker-compose.yml.tt
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
version: '3.2'
version: '3.8'

services:
db:
image: postgres:<%= POSTGRES_VERSION %>
container_name: <%= CONTAINERIZED_APP_NAME %>-db
environment:
- POSTGRES_DB=<%= APP_NAME %>_production
- POSTGRES_PASSWORD=postgres
ports:
- "5432:5432"

Expand Down
49 changes: 0 additions & 49 deletions .template/addons/semaphore/.semaphore/README.md.tt

This file was deleted.

42 changes: 0 additions & 42 deletions .template/addons/semaphore/.semaphore/promotion-production.yml.tt

This file was deleted.

42 changes: 0 additions & 42 deletions .template/addons/semaphore/.semaphore/promotion-staging.yml.tt

This file was deleted.

70 changes: 0 additions & 70 deletions .template/addons/semaphore/.semaphore/semaphore.yml.tt

This file was deleted.

5 changes: 0 additions & 5 deletions .template/addons/semaphore/template.rb

This file was deleted.

2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
nodejs >= 18
ruby 3.2.2
ruby 3.3.1
4 changes: 2 additions & 2 deletions Gemfile.tt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'https://rubygems.org'
ruby '<%= RUBY_VERSION %>'

# Backend
gem 'rails', '7.1.2' # Latest stable
gem 'rails', '~> 7.1' # Latest stable
gem 'pg' # Use Postgresql as database
gem 'puma' # Use Puma as the app server
gem 'mini_magick' # A ruby wrapper for ImageMagick or GraphicsMagick command line
Expand Down Expand Up @@ -53,7 +53,7 @@ group :development, :test do
# Code Analysis
gem 'bullet' # help to kill N+1 queries and unused eager loading
gem 'brakeman', require: false # A static analysis security vulnerability scanner for Ruby on Rails applications
gem 'parser', '3.2.2.3' # Use correct parser version to avoid parser warnings
gem 'parser', '~> 3.3' # Use correct parser version to avoid parser warnings
gem 'rubocop', require: false # A Ruby static code analyzer and formatter, based on the community Ruby style guide.
gem 'rubocop-rails', require: false # A RuboCop extension focused on enforcing Rails best practices and coding conventions.
gem 'rubocop-rspec', require: false # Code style checking for RSpec files
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ with building complex applications over the years.

### Requirements

- Install ruby and set your local ruby version to `3.2.2`
- Install rails `7.1.2`
- Install node `18.19.0` (For creating web application)
- Install ruby and set your local ruby version to `3.3.1`
- Install rails `7.1.3`
- Install node `22.1.0` (For creating web application)

> 📝 If running on Apple M1, to build docker image, please make sure to set platform to AMD64 by `export DOCKER_DEFAULT_PLATFORM=linux/amd64`
Expand Down Expand Up @@ -49,7 +49,6 @@ Available Addons:
- `docker`
- `nginx`
- `phrase`
- `semaphore`
- `bootstrap`
- `slim`
- `devise`
Expand Down
12 changes: 5 additions & 7 deletions template.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
APP_NAME_HUMANIZED = app_name.split(/[-_]/).map(&:capitalize).join(' ').gsub(/ Web$/, '')
DOCKER_REGISTRY_HOST = 'docker.io'
DOCKER_IMAGE = "nimblehq/#{CONTAINERIZED_APP_NAME}".freeze
RUBY_VERSION = '3.2.2'
POSTGRES_VERSION = '15.2'
REDIS_VERSION = '6.2.7'
RUBY_VERSION = '3.3.1'
POSTGRES_VERSION = '16.3'
REDIS_VERSION = '7.0.9'
# Variants
API_VARIANT = options[:api] || ENV['API'] == 'true'
WEB_VARIANT = !API_VARIANT
Expand All @@ -22,8 +22,8 @@
}.freeze

if WEB_VARIANT
NODE_VERSION = '18.19.0'
NODE_SOURCE_VERSION = '18' # Used in Dockerfile https://github.com/nodesource/distributions
NODE_VERSION = '22.1.0'
NODE_SOURCE_VERSION = '22' # Used in Dockerfile https://github.com/nodesource/distributions
end

def apply_template!(template_root)
Expand Down Expand Up @@ -95,7 +95,6 @@ def ask_for_all_variant_addons
@install_github_action = yes?(install_addon_prompt('Github Action and Wiki'))
@install_openapi = API_VARIANT || yes?(install_addon_prompt('OpenAPI'))
@install_mock_server = @install_openapi && yes?(install_addon_prompt('Mock Server'))
@install_semaphore = yes?(install_addon_prompt('SemaphoreCI'))
@install_nginx = yes?(install_addon_prompt('Nginx'))
@install_phrase = yes?(install_addon_prompt('Phrase'))
@install_crud = WEB_VARIANT && yes?(install_addon_prompt('Crud (includes Devise, Bootstrap and Slim)'))
Expand All @@ -112,7 +111,6 @@ def ask_for_web_variant_addons
def apply_optional_addons
apply '.template/addons/github/template.rb' if @install_github_action
apply '.template/addons/openapi/template.rb' if @install_openapi
apply '.template/addons/semaphore/template.rb' if @install_semaphore
apply '.template/addons/nginx/template.rb' if @install_nginx
apply '.template/addons/phrase/template.rb' if @install_phrase
apply '.template/addons/devise/template.rb' if @install_devise
Expand Down

0 comments on commit 1fa47e9

Please sign in to comment.