Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
8 changes: 4 additions & 4 deletions .github/workflows/build_app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
inputs:
ruby_version:
description: 'Ruby Version'
default: "3.1.1"
default: "3.2.6"
type: string
required: false
node_version:
Expand Down Expand Up @@ -34,19 +34,19 @@ jobs:
env:
POSTGRES_PASSWORD: postgres
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ inputs.ruby_version }}
bundler-cache: true
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node_version }}
cache: 'npm'
cache-dependency-path: ./package-lock.json
- uses: actions/cache@v3
- uses: actions/cache@v4
id: app-cache
with:
path: ./spec/decidim_dummy_app/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:

env:
CI: "true"
RUBY_VERSION: 3.1.1
RUBY_VERSION: 3.2.6
NODE_VERSION: 18.17.1

concurrency:
Expand All @@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: actions/setup-node@master
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/test_app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
inputs:
ruby_version:
description: 'Ruby Version'
default: "3.1.1"
default: "3.2.6"
required: false
type: string
test_command:
Expand Down Expand Up @@ -41,8 +41,15 @@ jobs:
--health-retries 5
env:
POSTGRES_PASSWORD: postgres
redis:
image: redis
options: >-
--health-cmd "redis-cli ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: ruby/setup-ruby@v1
Expand All @@ -59,7 +66,7 @@ jobs:
name: Install Chrome version ${{inputs.chrome_version}}
with:
chromedriver-version: ${{inputs.chrome_version}}
- uses: actions/cache@v3
- uses: actions/cache@v4
id: app-cache
with:
path: ./spec/decidim_dummy_app/
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ spec/decidim_dummy_app
# default development application
development_app
.rubocop-https*-yml
.byebug_history
.rbenv-vars
.env
7 changes: 2 additions & 5 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
inherit_from: https://raw.githubusercontent.com/decidim/decidim/release/0.28-stable/.rubocop.yml
inherit_gem:
decidim-dev: rubocop-decidim.yml

AllCops:
Include:
Expand All @@ -14,7 +15,3 @@ AllCops:
- "node_modules/**/*"
- "db/schema.rb"
- "vendor/**/*"

RSpec/FilePath:
Exclude:
- "spec/serializers/user_export_serializer_spec.rb"
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.1
3.2.6
14 changes: 3 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

DECIDIM_VERSION = "~> 0.28"
DECIDIM_VERSION = "~> 0.29.2"

source "https://rubygems.org"

Expand All @@ -9,9 +9,8 @@ ruby RUBY_VERSION
gem "decidim", DECIDIM_VERSION
gem "decidim-extra_user_fields", path: "."

gem "bootsnap", "~> 1.3"
gem "country_select", "~> 4.0"
gem "puma", ">= 4.3"
gem "bootsnap", "~> 1.7"
gem "puma", ">= 6.3.1"

group :development, :test do
gem "byebug", "~> 11.0", platform: :mri
Expand All @@ -23,12 +22,5 @@ group :development do
gem "letter_opener_web", "~> 2.0"
gem "listen", "~> 3.1"
gem "rubocop-faker"
gem "spring", "~> 2.0"
gem "spring-watcher-listen", "~> 2.0"
gem "web-console", "~> 4.2"
end

group :test do
gem "rubocop-factory_bot", "!= 2.26.0", require: false
gem "rubocop-rspec_rails", "!= 2.29.0", require: false
end
Loading