Skip to content

Commit

Permalink
Upgrade decidim to 0.28 (#55)
Browse files Browse the repository at this point in the history
* Upgrade to 0.28

* Remove duplicated method

* Update SimpleCov configuration ignoring rake task

* Fix CI

* Fix birthday year on test

* Update required ruby version

* Setup node with the NODE_VERSION specified

* Remove unused method in the Rakefile
  • Loading branch information
fblupi authored Mar 27, 2024
1 parent 072d60a commit df16cf4
Show file tree
Hide file tree
Showing 105 changed files with 5,827 additions and 9,008 deletions.
1 change: 1 addition & 0 deletions .erb-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ linters:
allowed_types:
- text/javascript
- text/template
- text/x-jsrender

Rubocop:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "@decidim"
}
}
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.5
RUBY_VERSION: 3.1.1

jobs:
lint-report:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
Expand Down
33 changes: 20 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.5
RUBY_VERSION: 3.1.1
NODE_VERSION: 18.17.1

jobs:
test-report:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

services:
postgres:
Expand All @@ -24,10 +25,16 @@ jobs:
--health-retries 5
env:
POSTGRES_PASSWORD: postgres

redis:
image: redis:3.2-alpine
ports: ["6379:6379"]

env:
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres
DATABASE_HOST: localhost
RAILS_ENV: test

steps:
- uses: actions/checkout@v2
Expand All @@ -39,23 +46,23 @@ jobs:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

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

- name: List Chrome
run: apt list --installed | grep chrome

- name: Remove Chrome
run: sudo apt remove google-chrome-stable
node-version: ${{ env.NODE_VERSION }}

- uses: browser-actions/setup-chrome@v1
with:
chrome-version: 119.0.6045.105
- uses: nanasess/setup-chromedriver@v2

- name: Setup Database
run: bundle exec rake test_app

- name: Precompile assets
working-directory: ./spec/decidim_dummy_app/
env:
BUNDLE_GEMFILE: ../../Gemfile
run: |
npm install
bundle exec rake assets:precompile
- name: Run RSpec
run: bundle exec rspec
env:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ development_app
*.gem
node_modules/
npm_debug.log

.nvmrc
11 changes: 0 additions & 11 deletions .rubocop-disabled.yml

This file was deleted.

30 changes: 26 additions & 4 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,26 @@
inherit_from:
- .rubocop_ruby.yml
- .rubocop_rails.yml
- .rubocop-disabled.yml
inherit_from: .rubocop_todo.yml

inherit_gem:
decidim-dev: rubocop-decidim.yml

inherit_mode:
merge:
- Exclude

AllCops:
Include:
- "**/*.rb"
- "**/*.rake"
- "**/*.ru"
- "**/Gemfile"
- "**/Rakefile"
Exclude:
- "spec/decidim_dummy_app/**/*"
- "**/spec/decidim_dummy_app/**/*"
- "bin/**/*"
- "node_modules/**/*"
- "**/node_modules/**/*"
- "db/schema.rb"
- "db/migrate/*"
- "vendor/**/*"
- "**/vendor/**/*"
93 changes: 0 additions & 93 deletions .rubocop_rails.yml

This file was deleted.

Loading

0 comments on commit df16cf4

Please sign in to comment.