Skip to content

Commit d9b98d2

Browse files
Upgrade to 0.29 (#107)
* upgrade to 0.29 * package.json * fix commands * fix commands * fix controller * update readme * fix component.rb * remove test * remove elections from spec * remove decidim-elections pack * fix assign proposal valuators * fix md5 * fix ReportedMailer spec * remove similarity_limit * fix assign_valuators * fix npm lint * fix proposal answer template * fir overriden views * fix assign/unassign valuators, permissions * fix tests * fix upload photos * add dynamically_attach_file * add imagemagick * add imagemagick * Update CI workflows * Update CI workflows * fix show_valuators_name * fix tests * add compare step * change steps * fix compare step * fix device_camera_spec * fix tests * fix proposals_controller_spec * refactor * fix tests * fix reporting * fix scss * specs * fix specs * fix specs --------- Co-authored-by: Ivan Vergés <[email protected]>
1 parent c1b0695 commit d9b98d2

File tree

106 files changed

+1343
-3125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1343
-3125
lines changed

.github/workflows/lint.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ on:
88

99
env:
1010
CI: "true"
11-
RUBY_VERSION: 3.1.1
11+
SIMPLECOV: "true"
12+
RUBY_VERSION: 3.2.6
1213
NODE_VERSION: 18.17.1
14+
SHAKAPACKER_RUNTIME_COMPILE: "false"
1315

1416
jobs:
1517
lint-report:
@@ -21,6 +23,11 @@ jobs:
2123
with:
2224
fetch-depth: 1
2325

26+
- uses: ruby/setup-ruby@v1
27+
with:
28+
ruby-version: ${{ env.RUBY_VERSION }}
29+
bundler-cache: true
30+
2431
- uses: actions/setup-node@master
2532
with:
2633
node-version: ${{ env.NODE_VERSION }}
@@ -34,11 +41,6 @@ jobs:
3441
- run: npm run stylelint
3542
name: Lint SCSS files
3643

37-
- uses: ruby/setup-ruby@v1
38-
with:
39-
ruby-version: ${{ env.RUBY_VERSION }}
40-
bundler-cache: true
41-
4244
- run: bundle exec rubocop -P
4345
name: Lint Ruby files
4446

.github/workflows/test_integration.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,21 @@ on:
99
env:
1010
CI: "true"
1111
SIMPLECOV: "true"
12-
RUBY_VERSION: 3.1.1
12+
RUBY_VERSION: 3.2.6
1313
NODE_VERSION: 18.17.1
1414
RAILS_ENV: test
1515
DATABASE_USERNAME: postgres
1616
DATABASE_PASSWORD: postgres
1717
DATABASE_HOST: localhost
18+
DISABLE_SPRING: "1"
1819
jobs:
1920
build:
2021
name: Build & Precompile
2122
runs-on: ubuntu-latest
2223

2324
services:
2425
postgres:
25-
image: postgres:11
26+
image: postgres:14
2627
ports: ["5432:5432"]
2728
options: >-
2829
--health-cmd pg_isready
@@ -33,25 +34,27 @@ jobs:
3334
POSTGRES_PASSWORD: postgres
3435

3536
steps:
36-
3737
- uses: actions/checkout@v4
3838
with:
3939
fetch-depth: 1
4040

41+
- name: Install additional tools
42+
run: sudo apt-get update; sudo apt-get -f install wkhtmltopdf imagemagick
43+
4144
- uses: ruby/setup-ruby@v1
4245
with:
4346
ruby-version: ${{ env.RUBY_VERSION }}
4447
bundler-cache: true
4548

46-
- uses: actions/setup-node@v3
49+
- uses: actions/setup-node@v4
4750
with:
4851
node-version: ${{ env.NODE_VERSION }}
4952
cache: 'npm'
5053
cache-dependency-path: package-lock.json
5154

5255
- name: Node packages
5356
run: npm ci
54-
57+
5558
- name: Setup Database
5659
run: bundle exec rake test_app
5760

@@ -98,13 +101,16 @@ jobs:
98101
POSTGRES_PASSWORD: postgres
99102

100103
steps:
101-
- uses: actions/checkout@v3
104+
- uses: actions/checkout@v4
102105
with:
103106
fetch-depth: 1
104107

108+
- name: Install additional tools
109+
run: sudo apt-get update; sudo apt-get -f install wkhtmltopdf imagemagick
110+
105111
- uses: nanasess/setup-chromedriver@v2
106112
with:
107-
chromedriver-version: 119.0.6045.105
113+
chromedriver-version: 126.0.6478.182
108114

109115
- name: List Chrome
110116
run: apt list --installed | grep chrome
@@ -114,7 +120,7 @@ jobs:
114120

115121
- uses: browser-actions/setup-chrome@v1
116122
with:
117-
chrome-version: 119.0.6045.105
123+
chrome-version: 126.0.6478.182
118124

119125
- uses: ruby/setup-ruby@v1
120126
with:
@@ -128,7 +134,7 @@ jobs:
128134
with:
129135
name: workspace
130136
path: /tmp
131-
137+
132138
- run: ls
133139
- run: tar -zxf /tmp/testapp-env.tar.gz
134140
- run: ls

.github/workflows/test_unit.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
env:
1010
CI: "true"
1111
SIMPLECOV: "true"
12-
RUBY_VERSION: 3.1.1
12+
RUBY_VERSION: 3.2.6
1313
NODE_VERSION: 18.17.1
1414

1515
jobs:
@@ -19,7 +19,7 @@ jobs:
1919

2020
services:
2121
postgres:
22-
image: postgres:11
22+
image: postgres:14
2323
ports: ["5432:5432"]
2424
options: >-
2525
--health-cmd pg_isready
@@ -32,15 +32,19 @@ jobs:
3232
DATABASE_USERNAME: postgres
3333
DATABASE_PASSWORD: postgres
3434
DATABASE_HOST: localhost
35+
DISABLE_SPRING: "1"
3536

3637
steps:
3738
- uses: actions/checkout@v4
3839
with:
3940
fetch-depth: 1
4041

42+
- name: Install additional tools
43+
run: sudo apt-get update; sudo apt-get -f install wkhtmltopdf imagemagick
44+
4145
- uses: nanasess/setup-chromedriver@v2
4246
with:
43-
chromedriver-version: 119.0.6045.105
47+
chromedriver-version: 126.0.6478.182
4448

4549
- name: List Chrome
4650
run: apt list --installed | grep chrome
@@ -50,7 +54,7 @@ jobs:
5054

5155
- uses: browser-actions/setup-chrome@v1
5256
with:
53-
chrome-version: 119.0.6045.105
57+
chrome-version: 126.0.6478.182
5458

5559
- uses: ruby/setup-ruby@v1
5660
with:

.rubocop-disabled.yml

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

.rubocop.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,22 @@
1+
12
inherit_from:
2-
- https://raw.githubusercontent.com/decidim/decidim/release/0.28-stable/.rubocop.yml
3+
- https://raw.githubusercontent.com/decidim/decidim/release/0.29-stable/.rubocop.yml
4+
5+
# Offense count: 8
6+
# This cop supports unsafe autocorrection (--autocorrect-all).
7+
# Configuration parameters: AllowedMethods, AllowedPatterns.
8+
Style/ReturnNilInPredicateMethodDefinition:
9+
Enabled: false
10+
11+
# Offense count: 5
12+
# Configuration parameters: EnforcedStyle, AllowedGems, Include.
13+
# SupportedStyles: Gemfile, gems.rb, gemspec
14+
# Include: **/*.gemspec, **/Gemfile, **/gems.rb
15+
Gemspec/DevelopmentDependencies:
16+
Enabled: false
17+
18+
AllCops:
19+
Exclude:
20+
- "spec/decidim_dummy_app*/**/*"
21+
- "development_app/**/*"
22+
- "node_modules/**/*"

.rubocop_rails.yml

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

0 commit comments

Comments
 (0)