Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump decidim from 0.24.3 to 0.25.2 #106

Merged
merged 11 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name: Lint
on:
push:
branches:
- master
- main
pull_request:

env:
RUBY_VERSION: 2.7.4
NODE_VERSION: 12.9.1
RUBY_VERSION: 2.7.5
NODE_VERSION: 16.9.1

jobs:
lint:
name: Lint code
Expand All @@ -34,4 +34,3 @@ jobs:

- run: bundle exec mdl *.md
name: Lint Markdown files

42 changes: 32 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@ name: Test
on:
push:
branches:
- master
- main
pull_request:

env:
RUBY_VERSION: 2.7.4
NODE_VERSION: 12.9.1
RUBY_VERSION: 2.7.5
NODE_VERSION: 16.9.1

jobs:
test:
name: Test
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
services:
postgres:
image: postgres:11
ports:
- 5432:5432
env:
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_HOST_AUTH_METHOD: trust
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

Expand All @@ -35,18 +35,40 @@ jobs:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

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

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

- name: Remove Chrome
shell: "bash"
run: sudo apt remove google-chrome-stable

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

- name: Bundle Install
run: bundle install

- name: Setup & create Database
run: |
bundle exec rails db:create db:schema:load
run: bundle exec rake db:test:prepare
env:
RAILS_ENV: test
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres

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

- name: Run RSpec
run: SIMPLECOV=1 CODECOV=1 bundle exec rspec
Expand Down
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,16 @@ config/deploy
config/deploy.rb
config/application.yml
Capfile

/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity

/public/decidim-packs
/public/packs
/public/packs-test

.rubocop-*

.idea/
24 changes: 21 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
inherit_from:
- .rubocop_ruby.yml
- .rubocop_rails.yml
inherit_from: https://raw.githubusercontent.com/decidim/decidim/release/0.25-stable/.rubocop.yml

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

This file was deleted.

Loading
Loading