Skip to content

Commit

Permalink
Merge pull request #1 from openpoke/upgrade-027
Browse files Browse the repository at this point in the history
Upgrade 27
  • Loading branch information
microstudi committed Jan 9, 2024
2 parents f6e74a2 + f6623ef commit 6aa658f
Show file tree
Hide file tree
Showing 248 changed files with 185,909 additions and 15,529 deletions.
21 changes: 18 additions & 3 deletions .github/workflows/decidim_ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
name: "[CI] Decidim"
on: [push]
on:
push:
branches:
- main
pull_request:

env:
RUBY_VERSION: 2.7.6
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.19.1

jobs:
tests:
Expand Down Expand Up @@ -36,6 +41,14 @@ jobs:
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: 119.0.6045.105

- uses: actions/setup-node@master
with:
node-version: ${{ env.NODE_VERSION }}

- name: Setup & create Database
run: |
Expand All @@ -46,7 +59,9 @@ jobs:
DATABASE_PASSWORD: postgres

- name: Precompile assets
run: bundle exec rake assets:precompile
run: |
npm ci
bundle exec rake assets:precompile
env:
RAILS_ENV: test

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
# Ignore public uploads
/public/assets
/public/uploads
/public/sw.js
/public/sw.js.map

# Ignore .rbenv-vars
.rbenv-vars
Expand Down
11 changes: 11 additions & 0 deletions .rubocop-disabled.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Style/OpenStructUse:
Enabled: false

Gemspec/RequireMFA:
Enabled: false

Naming/MemoizedInstanceVariableName:
Enabled: false

RSpec/VerifiedDoubleReference:
Enabled: false
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
inherit_from:
- .rubocop_ruby.yml
- .rubocop_rails.yml
- .rubocop-disabled.yml
4 changes: 4 additions & 0 deletions .rubocop_rails.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Rails/Output:
- lib/**/*.rb
Exclude:
- db/seeds.rb

Rails/OutputSafety:
Enabled: false

Expand All @@ -85,3 +86,6 @@ Rails/SkipsModelValidations:
Rails/Validation:
Include:
- app/models/**/*.rb

Rails/CompactBlank:
Enabled: false
34 changes: 24 additions & 10 deletions .rubocop_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ AllCops:
- "**/Gemfile"
- "**/Rakefile"
Exclude:
- "**/node_modules/**/*"
- "**/vendor/**/*"
- "development_app/**/*"
- "decidim_app-design/node_modules/**/*"
- "spec/decidim_dummy_app/**/*"
- "node_modules/**/*"
- "db/migrate/*"
- "db/schema.rb"
- "decidim-initiatives/lib/gem_overrides/origami/date.rb"
# Default formatter will be used if no -f/--format option is given.
DefaultFormatter: progress
# Cop names are not displayed in offense messages by default. Change behavior
Expand Down Expand Up @@ -69,12 +70,12 @@ AllCops:
# If a value is specified for TargetRubyVersion then it is used.
# Else if .ruby-version exists and it contains an MRI version it is used.
# Otherwise we fallback to the oldest officially supported Ruby version (2.0).
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0

RSpec:
Patterns:
- "(?:^|/)spec/"
- "(?:^|/)test/"
# RSpec:
# Patterns:
# - "(?:^|/)spec/"
# - "(?:^|/)test/"

# Indent private/protected/public as deep as method definitions
Layout/AccessModifierIndentation:
Expand Down Expand Up @@ -178,6 +179,15 @@ Layout/ParameterAlignment:
# But it can be overridden by setting this parameter
IndentationWidth: ~

Style/ArrayCoercion:
Description: >-
Use Array() instead of explicit Array check or [*var], when dealing
with a variable you want to treat as an Array, but you're not certain it's an array.
StyleGuide: '#array-coercion'
Safe: false
Enabled: false
VersionAdded: '0.88'

Style/AndOr:
# Whether `and` and `or` are banned only in conditionals (conditionals)
# or completely (always).
Expand Down Expand Up @@ -453,6 +463,7 @@ Naming/FileName:
- "**/Gemfile"
- "**/Rakefile"
- "**/*.gemspec"
- "decidim-dev/lib/decidim-dev.rb"
# When true, requires that each source file should define a class or module
# with a name which matches the file name (converted to ... case).
# It further expects it to be nested inside modules which match the names
Expand Down Expand Up @@ -1220,7 +1231,7 @@ RSpec/ContextWording:
RSpec/DescribeClass:
Exclude:
- spec/gemfiles_spec.rb
- spec/js_bundles_spec.rb
- spec/webpacker_spec.rb
- spec/i18n_spec.rb
- "**/*/spec/**/*_badge_spec.rb"
- decidim-core/spec/lib/global_engines_spec.rb
Expand Down Expand Up @@ -1250,6 +1261,8 @@ RSpec/MultipleExpectations:

RSpec/MultipleMemoizedHelpers:
Max: 35
Exclude:
- decidim-assemblies/spec/forms/assembly_form_spec.rb

RSpec/NestedGroups:
Max: 7
Expand All @@ -1258,10 +1271,11 @@ RSpec/NamedSubject:
Enabled: false

RSpec/RepeatedExampleGroupDescription:
Enabled: false
Enabled: true

RSpec/RepeatedExampleGroupBody:
Enabled: false
Enabled: true

RSpec/VerifiedDoubles:
Enabled: false

Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.7
3.0.6
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.3.3
FROM ruby:3.0.6
MAINTAINER david.morcillo@codegram.com

ARG rails_env=production
Expand Down
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = { github: "decidim/decidim", ref: "791c58ce8abb66a2fc04168c9b78e22fe334230c" }.freeze
DECIDIM_VERSION = "0.27.5"

gem "decidim", DECIDIM_VERSION
gem "decidim-conferences", DECIDIM_VERSION
gem "decidim-consultations", DECIDIM_VERSION
gem "decidim-initiatives", DECIDIM_VERSION
gem "decidim-notify"
#gem "decidim-notify"
# Change term_customizer dependency to ruby-gems' when term-customizer is compatible with DECIDIM_VERSION
gem "decidim-term_customizer", github: "openpoke/decidim-module-term_customizer"
gem "decidim-term_customizer", github: "mainio/decidim-module-term_customizer"

gem "decidim-decidim_awesome", github: "decidim-ice/decidim-module-decidim_awesome"
gem "decidim-direct_verifications"
gem "decidim-navigation_maps", "~> 1.3.0"
gem "decidim-navigation_maps", github: "platoniq/decidim-module-navigation_maps"
# gem "decidim-time_tracker", github: "Platoniq/decidim-module-time_tracker"

gem "decidim-calendar", github: "openpoke/decidim-module-calendar"
gem "decidim-newsletter_agenda", github: "openpoke/decidim-module-newsletter_agenda", branch: "style-changes-afeter-tests"
gem "decidim-newsletter_agenda", github: "openpoke/decidim-module-newsletter_agenda"

gem "puma"
gem "wicked_pdf"
Expand Down
Loading

0 comments on commit 6aa658f

Please sign in to comment.