Skip to content
Merged
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
18 changes: 10 additions & 8 deletions .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
if: "github.ref != 'refs/heads/develop'"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- uses: actions/checkout@v2.0.0
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -47,17 +47,19 @@ jobs:
if: "github.ref != 'refs/heads/develop'"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- uses: actions/checkout@v2.0.0
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- run: sudo apt install imagemagick
name: Install imagemagick
- run: bundle exec rake test_app
name: Create test app
- run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
name: Create the screenshots folder
- uses: nanasess/setup-chromedriver@v1.0.1
- uses: nanasess/setup-chromedriver@v2
- name: Run precompile if needed
run: |
if [[ -d "app/views" ]] || [[ -d "spec/mailers" ]] || [[ -d "spec/system" ]]; then
Expand All @@ -68,8 +70,8 @@ jobs:
fi
- run: bundle exec rspec
name: RSpec
- uses: codecov/codecov-action@v1
- uses: actions/upload-artifact@v2
- uses: codecov/codecov-action@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: screenshots
Expand All @@ -80,7 +82,7 @@ jobs:
needs: [tests, lint]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.0.0
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: ruby/setup-ruby@v1
Expand All @@ -106,7 +108,7 @@ jobs:
needs: release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Publish to RubyGems
run: |
mkdir -p $HOME/.gem
Expand All @@ -116,4 +118,4 @@ jobs:
gem build *.gemspec
gem push *.gem
env:
GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_API_KEY}}"
GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_API_KEY}}"
4 changes: 2 additions & 2 deletions .rubocop_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ AllCops:
# If a value is specified for TargetRubyVersion then it is used.
# Else if .ruby-version exists and it contains an MRI version it is used.
# Otherwise we fallback to the oldest officially supported Ruby version (2.0).
TargetRubyVersion: 2.7
TargetRubyVersion: 3.2.2

# Indent private/protected/public as deep as method definitions
Layout/AccessModifierIndentation:
Expand Down Expand Up @@ -1756,4 +1756,4 @@ Faker/DeprecatedArguments:
- random_words_to_add
questions:
- number
- supplemental
- supplemental
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.5
3.2.2
15 changes: 6 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,19 @@ gem "decidim"
gem "decidim-cache_cleaner", path: "."

gem "bootsnap", "~> 1.4"
gem "puma", ">= 4.3"

group :test do
gem "rubocop-faker"
end
gem "puma", ">= 6.3.1"

group :development, :test do
gem "byebug", "~> 11.0", platform: :mri
gem "decidim-dev"
gem "rubocop-faker"
end

group :development do
gem "faker", "~> 2.14"
gem "letter_opener_web", "~> 1.3"
gem "faker", "~> 3.2"
gem "letter_opener_web", "~> 2.0"
gem "listen", "~> 3.1"
gem "spring", "~> 2.0"
gem "spring", "~> 4.0"
gem "spring-watcher-listen", "~> 2.0"
gem "web-console", "~> 4.0"
gem "web-console", "~> 4.2"
end
Loading