Skip to content

Commit

Permalink
Merge branch 'release/0.27-stable' of github.com:AjuntamentdeBarcelon…
Browse files Browse the repository at this point in the history
…a/decidim into release/0.27-stable-bcn
  • Loading branch information
fblupi committed Feb 13, 2023
2 parents d8d945f + 6784352 commit 1e5757c
Show file tree
Hide file tree
Showing 3,603 changed files with 76,755 additions and 54,437 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .decidim-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.26.4
0.27.2
2 changes: 2 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

open_collective: decidim
20 changes: 15 additions & 5 deletions .github/actions/module-rspec/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@ inputs:
github_token:
description: 'Github token'
required: true
ruby-version:
ruby_version:
description: 'Ruby Version'
default: "2.7.5"
default: "3.0.2"
required: false
node-version:
node_version:
description: 'Node version'
default: '16.9.1'
required: false
processor_count:
description: "Number or parallel jobs to run"
default: "4"
required: false

runs:
using: "composite"
Expand All @@ -25,11 +29,11 @@ runs:
GITHUB_TOKEN: " ${{ inputs.github_token }}"
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ inputs.ruby-version }}
ruby-version: ${{ inputs.ruby_version }}
bundler-cache: true
- uses: actions/setup-node@v1
with:
node-version: ${{ inputs.node-version }}
node-version: ${{ inputs.node_version }}
- name: Get npm cache directory path
id: npm-cache-dir-path
run: echo "::set-output name=dir::$(npm get cache)-${{ inputs.name }}"
Expand All @@ -56,3 +60,9 @@ runs:
name: Scanning Security issues on module
working-directory: ${{ inputs.name }}
shell: "bash"
- run: bundle exec rake parallel:create parallel:migrate
name: Parallel tests
shell: "bash"
working-directory: ./spec/decidim_dummy_app/
env:
PARALLEL_TEST_PROCESSORS: " ${{ inputs.processor_count }}"
14 changes: 14 additions & 0 deletions .github/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Configuration for request-info - https://github.com/behaviorbot/request-info
#
requestInfoReplyComment: >
It seems like you didn't give us much information about what you're trying to do here.
We would appreciate it if you could provide us with more info about this issue/PR!
checkIssueTemplate: true

checkPullRequestTemplate: true

requestInfoOn:
pullRequest: true
issue: true

12 changes: 8 additions & 4 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
daysUntilClose: false
# Ignore issues in a project
exemptProjects: true
# Ignore issues in a milestone
Expand All @@ -14,8 +14,12 @@ exemptLabels:
- "type: bug"
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions. @carolromero & @andreslucena feel free to chime in.
Thank you for your contribution. This issue has been automatically marked
as stale because it has not had recent activity.
Is this still relevant? If so, what is blocking it? Is there anything you
can do to help move it forward?
@carolromero & @andreslucena feel free to chime in.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
11 changes: 9 additions & 2 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Individual workflows with changes:
working-directory: ${{ env.DECIDIM_MODULE }}
```
- `ci_comments.yml`: Runs tests for the JS files. Tests must run from the project root folder. You'll need to install NodeJS and the JS dependencies:
- `ci_javascript.yml`: Runs tests for the JS files. Tests must run from the project root folder. You'll need to install NodeJS and the JS dependencies:

```yml
- uses: actions/setup-node@master
Expand All @@ -32,8 +32,15 @@ Individual workflows with changes:
name: Test JS files
```

- Proposals specs are split in three workflows:
- Some specs are split in three workflows, so if we need to retry this particular workflow we don't need to retry all the module suite. For instance proposals:

- `ci_proposals_system_admin.yml`: Runs the system specs for the admin section
- `ci_proposals_system_public.yml`: Runs the system specs for the public section
- `ci_proposals_unit_tests.yml`: Runs the unit tests

- `ci_performance_metrics_monitoring.yml`: Runs Lighthouse metrics expectations against the app to detect any performance regression. The expectations can be found in `lighthouse_budget.json`, where a time is defined for each metric:

- [First Contentful Paint](https://web.dev/first-contentful-paint/): 2 seconds
- [Speed Index](https://web.dev/speed-index/): 4 seconds
- [Time to Interactive](https://web.dev/interactive/): 5 seconds
- [Largest Contentful Paint](https://web.dev/lcp/): 2.5 seconds
8 changes: 6 additions & 2 deletions .github/workflows/ci_accountability.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ on:

env:
CI: "true"
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1
DECIDIM_MODULE: decidim-accountability
PARALLEL_TEST_PROCESSORS: 2

jobs:
main:
Expand Down Expand Up @@ -61,7 +62,10 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
name: ${{ env.DECIDIM_MODULE }}
- run: bundle exec rspec
processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
ruby_version: ${{ env.RUBY_VERSION }}
node_version: ${{ env.NODE_VERSION }}
- run: bundle exec rake parallel:spec
name: RSpec
working-directory: ${{ env.DECIDIM_MODULE }}
env:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/ci_admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ on:

env:
CI: "true"
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1
DECIDIM_MODULE: decidim-admin
PARALLEL_TEST_PROCESSORS: 2

jobs:
main:
Expand Down Expand Up @@ -52,7 +53,10 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
name: ${{ env.DECIDIM_MODULE }}
- run: bundle exec rspec --exclude-pattern 'spec/system/**/*_spec.rb'
processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
ruby_version: ${{ env.RUBY_VERSION }}
node_version: ${{ env.NODE_VERSION }}
- run: bundle exec rake parallel:spec['spec\/(?!system)']
name: RSpec
working-directory: ${{ env.DECIDIM_MODULE }}
env:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "[CI] Admin (system tests 1)"
name: "[CI] Admin (system tests)"
on:
push:
branches:
Expand All @@ -18,9 +18,10 @@ on:

env:
CI: "true"
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1
DECIDIM_MODULE: decidim-admin
PARALLEL_TEST_PROCESSORS: 2

jobs:
main:
Expand Down Expand Up @@ -56,11 +57,10 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
name: ${{ env.DECIDIM_MODULE }}
- run: |
count=$(ls spec/system/*_spec.rb | wc -l | tr -d ' ')
half=$(expr $count / 2)
list_of_files=$(ls spec/system/*_spec.rb | sed -n "1,$(echo $half)p" | xargs)
bundle exec rspec $list_of_files
processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
ruby_version: ${{ env.RUBY_VERSION }}
node_version: ${{ env.NODE_VERSION }}
- run: bundle exec rake parallel:spec[^spec/system]
name: RSpec
working-directory: ${{ env.DECIDIM_MODULE }}
env:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/ci_api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ on:

env:
CI: "true"
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1
DECIDIM_MODULE: decidim-api
PARALLEL_TEST_PROCESSORS: 2

jobs:
main:
Expand Down Expand Up @@ -53,7 +54,10 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
name: ${{ env.DECIDIM_MODULE }}
- run: bundle exec rspec
processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
ruby_version: ${{ env.RUBY_VERSION }}
node_version: ${{ env.NODE_VERSION }}
- run: bundle exec rake parallel:spec
name: RSpec
working-directory: ${{ env.DECIDIM_MODULE }}
env:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/ci_assemblies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ on:

env:
CI: "true"
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1
DECIDIM_MODULE: decidim-assemblies
PARALLEL_TEST_PROCESSORS: 2

jobs:
main:
Expand Down Expand Up @@ -56,7 +57,10 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
name: ${{ env.DECIDIM_MODULE }}
- run: bundle exec rspec
processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
ruby_version: ${{ env.RUBY_VERSION }}
node_version: ${{ env.NODE_VERSION }}
- run: bundle exec rake parallel:spec
name: RSpec
working-directory: ${{ env.DECIDIM_MODULE }}
env:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/ci_blogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ on:

env:
CI: "true"
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1
DECIDIM_MODULE: decidim-blogs
PARALLEL_TEST_PROCESSORS: 2

jobs:
main:
Expand Down Expand Up @@ -59,7 +60,10 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
name: ${{ env.DECIDIM_MODULE }}
- run: bundle exec rspec
processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
ruby_version: ${{ env.RUBY_VERSION }}
node_version: ${{ env.NODE_VERSION }}
- run: bundle exec rake parallel:spec
name: RSpec
working-directory: ${{ env.DECIDIM_MODULE }}
env:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/ci_budgets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ on:

env:
CI: "true"
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1
DECIDIM_MODULE: decidim-budgets
PARALLEL_TEST_PROCESSORS: 2

jobs:
main:
Expand Down Expand Up @@ -58,7 +59,10 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
name: ${{ env.DECIDIM_MODULE }}
- run: bundle exec rspec
processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
ruby_version: ${{ env.RUBY_VERSION }}
node_version: ${{ env.NODE_VERSION }}
- run: bundle exec rake parallel:spec
name: RSpec
working-directory: ${{ env.DECIDIM_MODULE }}
env:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/ci_comments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ on:

env:
CI: "true"
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1
DECIDIM_MODULE: decidim-comments
PARALLEL_TEST_PROCESSORS: 2

jobs:
main:
Expand Down Expand Up @@ -56,7 +57,10 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
name: ${{ env.DECIDIM_MODULE }}
- run: bundle exec rspec
processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
ruby_version: ${{ env.RUBY_VERSION }}
node_version: ${{ env.NODE_VERSION }}
- run: bundle exec rake parallel:spec
name: RSpec
working-directory: ${{ env.DECIDIM_MODULE }}
env:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/ci_conferences.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ on:

env:
CI: "true"
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1
DECIDIM_MODULE: decidim-conferences
PARALLEL_TEST_PROCESSORS: 2

jobs:
main:
Expand Down Expand Up @@ -57,7 +58,10 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
name: ${{ env.DECIDIM_MODULE }}
- run: bundle exec rspec
processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
ruby_version: ${{ env.RUBY_VERSION }}
node_version: ${{ env.NODE_VERSION }}
- run: bundle exec rake parallel:spec
name: RSpec
working-directory: ${{ env.DECIDIM_MODULE }}
env:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/ci_consultations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ on:

env:
CI: "true"
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1
DECIDIM_MODULE: decidim-consultations
PARALLEL_TEST_PROCESSORS: 2

jobs:
main:
Expand Down Expand Up @@ -57,7 +58,10 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
name: ${{ env.DECIDIM_MODULE }}
- run: bundle exec rspec
processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
ruby_version: ${{ env.RUBY_VERSION }}
node_version: ${{ env.NODE_VERSION }}
- run: bundle exec rake parallel:spec
name: RSpec
working-directory: ${{ env.DECIDIM_MODULE }}
env:
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/ci_core_lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ on:
- "decidim-api/**"
- "decidim-core/**"
- "decidim-dev/**"
- "packages/**"

env:
CI: "true"
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1
DECIDIM_MODULE: decidim-core
PARALLEL_TEST_PROCESSORS: 2

jobs:
main:
Expand Down Expand Up @@ -51,7 +53,10 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
name: ${{ env.DECIDIM_MODULE }}
- run: bundle exec rspec spec/lib
processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
ruby_version: ${{ env.RUBY_VERSION }}
node_version: ${{ env.NODE_VERSION }}
- run: bundle exec rake parallel:spec[^spec/lib]
name: RSpec
working-directory: ${{ env.DECIDIM_MODULE }}
env:
Expand Down
Loading

0 comments on commit 1e5757c

Please sign in to comment.