Skip to content

Commit fc378a6

Browse files
authored
Upgrade decidim to 0.29 (#54)
* Decidim version updated to 0.29.1 * concurrent-ruby error fixed and babel.config.json deleted * Admin panel test fixed * Linters config files updated * package.json updated to use decidim 0.29 and new linters * Apps generation rakes fixed * Linted * Use ubuntu-latest for test CI * Test CI updated * package.json updated * config/shakapacker.yml deleted * Install JS dependencies for test CI * Unnecessary precompilation deleted from CI test * imagemagick installed for CI * Replace codecov with coveralls * Gemfile.lock updated * Calendar colors fixed * Linted * JQuery removed
1 parent 3922145 commit fc378a6

39 files changed

+18573
-5216
lines changed

.eslintrc.json

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,11 @@
11
{
2-
"env": {
3-
"browser": true,
4-
"es2021": true
5-
},
6-
"extends": [
7-
"eslint:recommended"
8-
],
9-
"parserOptions": {
10-
"ecmaVersion": 12,
11-
"sourceType": "module"
2+
"extends": "@decidim",
3+
"rules": {
4+
"no-invalid-this": "off"
125
},
136
"globals": {
14-
"$": false,
15-
"jQuery": false,
16-
"L": false,
17-
"ApiFetcher": false,
18-
"FormStorage": false,
19-
"Quill": false,
20-
"InscrybMDE": false,
21-
"inlineAttachment": false
22-
},
23-
"rules": {
7+
"Calendar": "readonly",
8+
"timeGridPlugin": "readonly",
9+
"dayGridPlugin": "readonly"
2410
}
2511
}

.github/workflows/lint.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ on:
55
pull_request:
66

77
env:
8-
RUBY_VERSION: 3.1.1
8+
RUBY_VERSION: 3.2.2
9+
NODE_VERSION: 18.17.1
910

1011
jobs:
1112
lint-report:
12-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-latest
1314
steps:
1415
- uses: actions/checkout@v2.0.0
1516
with:
@@ -20,7 +21,17 @@ jobs:
2021
ruby-version: ${{ env.RUBY_VERSION }}
2122
bundler-cache: true
2223

23-
- name: Lint and Rubocop
24-
run: |
25-
bundle exec rubocop -P
26-
bundle exec erblint app/**/*.erb
24+
- run: npm ci
25+
name: Install JS deps
26+
27+
- run: npm run lint
28+
name: Lint JS files
29+
30+
- run: npm run stylelint
31+
name: Lint SCSS files
32+
33+
- run: bundle exec rubocop -P
34+
name: Lint Ruby files
35+
36+
- run: bundle exec erblint app/**/*.erb
37+
name: Lint ERB files

.github/workflows/test.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ on:
55
pull_request:
66

77
env:
8-
RUBY_VERSION: 3.1.1
8+
RUBY_VERSION: 3.2.2
9+
DISABLE_SPRING: 1
910
NODE_VERSION: 18.17.1
1011

1112
jobs:
1213
test-report:
13-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-latest
1415

1516
services:
1617
postgres:
@@ -27,6 +28,7 @@ jobs:
2728
DATABASE_USERNAME: postgres
2829
DATABASE_PASSWORD: postgres
2930
DATABASE_HOST: localhost
31+
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
3032

3133
steps:
3234
- uses: actions/checkout@v2
@@ -37,14 +39,22 @@ jobs:
3739
with:
3840
ruby-version: ${{ env.RUBY_VERSION }}
3941
bundler-cache: true
42+
43+
- run: |
44+
sudo apt install imagemagick
45+
46+
- name: Install JS dependencies
47+
run: npm ci
4048

4149
- name: Setup Database
4250
run: bundle exec rake test_app
4351

4452
- name: Run RSpec
45-
run: SIMPLECOV=1 CODECOV=1 bundle exec rake
53+
run: bundle exec rspec
54+
env:
55+
CI: 1
4656

47-
- uses: actions/upload-artifact@v2-preview
57+
- uses: actions/upload-artifact@v4
4858
if: always()
4959
with:
5060
name: screenshots

.rubocop.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
inherit_from: https://raw.githubusercontent.com/decidim/decidim/release/0.27-stable/.rubocop.yml
1+
inherit_from: .rubocop_todo.yml
2+
3+
inherit_gem:
4+
decidim-dev: rubocop-decidim.yml
5+
6+
inherit_mode:
7+
merge:
8+
- Exclude
29

310
AllCops:
411
Include:
@@ -8,14 +15,12 @@ AllCops:
815
- "**/Gemfile"
916
- "**/Rakefile"
1017
Exclude:
11-
- "development_app/**/*"
1218
- "spec/decidim_dummy_app/**/*"
19+
- "**/spec/decidim_dummy_app/**/*"
1320
- "bin/**/*"
1421
- "node_modules/**/*"
22+
- "**/node_modules/**/*"
1523
- "db/schema.rb"
24+
- "db/migrate/*"
1625
- "vendor/**/*"
17-
18-
RSpec/DescribeClass:
19-
Exclude:
20-
- "spec/*"
21-
- "spec/system/*"
26+
- "**/vendor/**/*"

.rubocop_rails.yml

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)