Skip to content

Commit

Permalink
Bump decidim from 0.24.3 to 0.26.8
Browse files Browse the repository at this point in the history
  • Loading branch information
fblupi committed Oct 27, 2023
1 parent de6c761 commit 6a6b38c
Show file tree
Hide file tree
Showing 134 changed files with 17,922 additions and 968 deletions.
11 changes: 11 additions & 0 deletions .ebextensions/03_precompile.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
commands:
01_nodejs:
command: "curl --silent --location https://rpm.nodesource.com/setup_16.x | sudo bash -"
02_yarn:
command: "wget https://dl.yarnpkg.com/rpm/yarn.repo -O /etc/yum.repos.d/yarn.repo && sudo yum install yarn -y"

container_commands:
01_install_webpack:
command: "npm install --save-dev webpack"
02_precompile:
command: "bundle exec rake assets:precompile"
7 changes: 3 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ on:

env:
RUBY_VERSION: 2.7.4
NODE_VERSION: 12.9.1
NODE_VERSION: 16.9.1

jobs:
lint:
name: Lint code
runs-on: ubuntu-latest
if: "!startsWith(github.head_ref, 'chore/l10n')"
runs-on: ubuntu-20.04
steps:
- uses: actions/[email protected]
with:
Expand Down
23 changes: 9 additions & 14 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,21 @@ on:

env:
RUBY_VERSION: 2.7.4
NODE_VERSION: 12.9.1

NODE_VERSION: 16.9.1
RAILS_ENV: test
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres

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_HOST_AUTH_METHOD: trust
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

Expand All @@ -38,19 +39,13 @@ jobs:
- name: Setup & create Database
run: |
bundle exec rails db:create db:schema:load
env:
RAILS_ENV: test
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres
- name: Precompile assets
run: bundle exec rake assets:precompile
run: |
npm install
bundle exec rake assets:precompile
env:
RAILS_ENV: test

- name: Run RSpec
run: SIMPLECOV=1 CODECOV=1 bundle exec rspec
env:
RAILS_ENV: test
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

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

/public/assets
.byebug_history
Expand All @@ -43,3 +45,7 @@ public/uploads
# Ignore .rspec-failures
.rspec-failures
.s3cfg

/public/decidim-packs
/public/packs
/public/packs-test
2 changes: 2 additions & 0 deletions .mdl_style.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@

exclude_rule "ol-prefix"

exclude_rule "ul-indent"

rule "no-trailing-punctuation", punctuation: ".,;:!"
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.7.6
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM decidim/decidim:0.21.0
FROM decidim/decidim:0.26.8
27 changes: 14 additions & 13 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,31 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = { git: "https://github.com/Platoniq/decidim", branch: "temp/0.24" }.freeze
DECIDIM_VERSION = "0.26.8"

gem "decidim", DECIDIM_VERSION
gem "decidim-alternative_landing", git: "https://github.com/Platoniq/decidim-module-alternative_landing", branch: "main"
gem "decidim-consultations", DECIDIM_VERSION
# gem "decidim-initiatives", DECIDIM_VERSION

gem "catcomu-managers", path: "./catcomu-managers"
gem "decidim-civicrm", git: "https://github.com/Platoniq/decidim-module-civicrm", branch: "main"

gem "decidim-decidim_awesome", "~> 0.7.2"
gem "decidim-direct_verifications", git: "https://github.com/Platoniq/decidim-verifications-direct_verifications"
gem "decidim-navigation_maps", "~> 1.2.0"
gem "decidim-alternative_landing", git: "https://github.com/Platoniq/decidim-module-alternative_landing", branch: "release/0.26-stable"
gem "decidim-civicrm", git: "https://github.com/Platoniq/decidim-module-civicrm", branch: "release/0.26-stable"
gem "decidim-decidim_awesome", "~> 0.8.3"
gem "decidim-direct_verifications", git: "https://github.com/Platoniq/decidim-verifications-direct_verifications", branch: "release/0.26-stable"
gem "decidim-navigation_maps", git: "https://github.com/Platoniq/decidim-module-navigation_maps", branch: "release/0.26-stable"

gem "bootsnap", "~> 1.4"
gem "bootsnap", "~> 1.11.0"
gem "health_check"
gem "sentry-rails"
gem "sentry-ruby"

gem "puma", ">= 5.0.0"
gem "uglifier", "~> 4.1"

gem "faker", "~> 2.14"
gem "rspec"
gem "rubocop-faker"

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

gem "decidim-dev", DECIDIM_VERSION
end
Expand All @@ -40,11 +38,14 @@ group :development do
gem "listen", "~> 3.1"
gem "spring", "~> 2.0"
gem "spring-watcher-listen", "~> 2.0"
gem "web-console", "~> 3.5"
gem "web-console"
end

group :production do
gem "fog-aws"
gem "aws-sdk-s3", require: false
gem "fog-aws" # to remove once images migrated
gem "sentry-rails"
gem "sentry-ruby"
gem "sidekiq", "~> 6.0"
gem "sidekiq-cron"
end
Expand Down
Loading

0 comments on commit 6a6b38c

Please sign in to comment.