Merge pull request #138 from DiputacioBarcelona/upgrade_0.28

Upgrade 0.28

.github/workflows/ci_age_action_authorization.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.0.6
+  RUBY_VERSION: 3.1.2
 
 jobs:
   test-report:

.github/workflows/ci_app.yml

@@ -9,8 +9,8 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.0.6
-  NODE_VERSION: 16.9.1
+  RUBY_VERSION: 3.1.2
+  NODE_VERSION: 18.17.1
 
 jobs:
   test:

.github/workflows/ci_census.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.0.6
+  RUBY_VERSION: 3.1.2
 
 jobs:
   test-report:

.github/workflows/ci_diba_census_api.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.0.6
+  RUBY_VERSION: 3.1.2
 
 jobs:
   test-report:

.github/workflows/ci_ldap.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.0.6
+  RUBY_VERSION: 3.1.2
 
 jobs:
   test-report:

.github/workflows/linters.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.0.6
+  RUBY_VERSION: 3.1.2
 
 jobs:
   lint:

.gitignore

@@ -47,3 +47,16 @@ yarn-debug.log*
 
 # Static files
 app/views/static/
+
+# Tailwind
+tailwind.config.js
+
+/public/packs
+/public/packs-test
+/public/decidim-packs
+/node_modules
+/packages/webpacker/node_modules
+/packages/core/node_modules
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity

.node-version

@@ -1 +1 @@
-16.9.1
+18.17.1

.nvmrc

@@ -0,0 +1 @@
+18.17.1

.rubocop_ruby.yml

@@ -72,7 +72,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: 3.0
+  TargetRubyVersion: 3.1
 
   RSpec:
     Patterns:

.ruby-version

@@ -1 +1 @@
-ruby-3.0.6
+ruby-3.1.2

Dockerfile.production

@@ -1,4 +1,4 @@
-FROM phusion/passenger-full:3.0.6
+FROM phusion/passenger-full:2.1.0
 MAINTAINER Populate "[email protected]"
 
 ENV HOME /home/app/decidim-diba
@@ -14,9 +14,15 @@ ENV TZ=Europe/Madrid
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # Install software dependencies
+RUN apt install -y ca-certificates
+RUN apt-get --allow-releaseinfo-change update
 RUN apt-get update
 RUN apt-get install -y imagemagick gettext-base tzdata
 
+RUN apt-get install -y --no-install-recommends libjemalloc2
+ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2
+ENV MALLOC_CONF='dirty_decay_ms:1000,narenas:2,background_thread:true'
+
 ##############################
 # Install NodeJs & Yarn
 ##############################
@@ -28,7 +34,7 @@ RUN mkdir -p /usr/local/nvm
 # Set debconf to run non-interactively
 #RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
-ENV NODE_VERSION 16.9.1
+ENV NODE_VERSION 18.17.1
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash \
     && . $NVM_DIR/nvm.sh \
     && nvm install $NODE_VERSION \
@@ -56,11 +62,11 @@ RUN rm /etc/nginx/sites-enabled/default
 RUN mkdir -p $HOME
 WORKDIR $HOME
 
-RUN bash -lc 'rvm install ruby-3.0.6'
-RUN bash -lc 'rvm --default use ruby-3.0.6'
+RUN bash -lc 'rvm install ruby-3.1.2'
+RUN bash -lc 'rvm --default use ruby-3.1.2'
 
 # Install bundle of gems
-RUN gem install bundler:2.3.6
+RUN gem install bundler:2.5.6
 RUN gem install rake:13.2.1
 ADD Gemfile Gemfile
 ADD Gemfile.lock Gemfile.lock

Gemfile

@@ -4,19 +4,19 @@ source "https://rubygems.org"
 
 ruby RUBY_VERSION
 
-DECIDIM_VERSION = { git: "https://github.com/CodiTramuntana/decidim.git", branch: "release/0.27-stable" }.freeze
+DECIDIM_VERSION = { git: "https://github.com/decidim/decidim.git", branch: "release/0.28-stable" }.freeze
 
 gem "decidim", DECIDIM_VERSION
 gem "decidim-age_action_authorization", path: "decidim-age_action_authorization"
 gem "decidim-census", path: "decidim-census"
-gem "decidim-consultations", DECIDIM_VERSION
-gem "decidim-decidim_awesome"
+# gem "decidim-consultations", DECIDIM_VERSION
+gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome.git", branch: "develop"
 gem "decidim-diba_census_api", path: "decidim-diba_census_api"
 gem "decidim-initiatives", DECIDIM_VERSION
 gem "decidim-ldap", path: "decidim-ldap"
 gem "decidim-templates", DECIDIM_VERSION
 
-gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer", branch: "release/0.27-stable"
+gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer", branch: "main"
 
 # Compatibility with decidim initiatives module
 gem "bootsnap"
@@ -28,6 +28,11 @@ gem "sidekiq-cron"
 gem "uglifier", ">= 1.3.0"
 gem "wicked_pdf"
 
+# Forced by production environment
+gem "base64", "0.1.1"
+gem "strscan", "3.0.1"
+gem "stringio", "3.0.1"
+
 group :development, :test do
   gem "byebug", platform: :mri
   gem "decidim-dev", DECIDIM_VERSION