Merge pull request #161 from DiputacioBarcelona/upgrade_0.30

Upgrade 0.30

Author: entantoencuanto

.github/workflows/ci_age_action_authorization.yml

@@ -9,15 +9,15 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.2.6
+  RUBY_VERSION: 3.3.4
 
 jobs:
   test-report:
     runs-on: ubuntu-latest
 
     services:
       postgres:
-        image: postgres:11
+        image: postgres:14
         ports: ["5432:5432"]
         options: >-
           --health-cmd pg_isready

.github/workflows/ci_app.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.2.6
+  RUBY_VERSION: 3.3.4
   NODE_VERSION: 18.17.1
 
 jobs:
@@ -18,7 +18,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:11
+        image: postgres:14
         ports: ["5432:5432"]
         options: >-
           --health-cmd pg_isready

.github/workflows/ci_census.yml

@@ -9,15 +9,15 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.2.6
+  RUBY_VERSION: 3.3.4
 
 jobs:
   test-report:
     runs-on: ubuntu-latest
 
     services:
       postgres:
-        image: postgres:11
+        image: postgres:14
         ports: ["5432:5432"]
         options: >-
           --health-cmd pg_isready

.github/workflows/ci_diba_census_api.yml

@@ -9,15 +9,15 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.2.6
+  RUBY_VERSION: 3.3.4
 
 jobs:
   test-report:
     runs-on: ubuntu-latest
 
     services:
       postgres:
-        image: postgres:11
+        image: postgres:14
         ports: ["5432:5432"]
         options: >-
           --health-cmd pg_isready

.github/workflows/ci_ldap.yml

@@ -9,15 +9,15 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.2.6
+  RUBY_VERSION: 3.3.4
 
 jobs:
   test-report:
     runs-on: ubuntu-latest
 
     services:
       postgres:
-        image: postgres:11
+        image: postgres:14
         ports: ["5432:5432"]
         options: >-
           --health-cmd pg_isready

.github/workflows/linters.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.2.6
+  RUBY_VERSION: 3.3.4
 
 jobs:
   lint:

.ruby-version

@@ -1 +1 @@
-ruby-3.2.6
+ruby-3.3.4

Dockerfile.production

@@ -1,4 +1,4 @@
-FROM phusion/passenger-full:2.1.0
+FROM phusion/passenger-full:3.1.6
 MAINTAINER Populate "fernando@populate.tools"
 
 ENV HOME /home/app/decidim-diba
@@ -17,12 +17,11 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 RUN apt install -y ca-certificates
 RUN apt-get --allow-releaseinfo-change update
 RUN apt-get update
+RUN apt-get install -y clang build-essential
 RUN apt-get install -y imagemagick gettext-base tzdata
 RUN apt-get install -y p7zip
 RUN apt-get install -y xfonts-base
 RUN apt-get install -y xfonts-75dpi
-RUN curl "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.bionic_amd64.deb" -L -o "wkhtmltox_0.12.6-1.bionic_amd64.deb"
-RUN dpkg -i wkhtmltox_0.12.6-1.bionic_amd64.deb
 
 RUN apt-get install -y --no-install-recommends libjemalloc2
 ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2
@@ -67,11 +66,17 @@ RUN rm /etc/nginx/sites-enabled/default
 RUN mkdir -p $HOME
 WORKDIR $HOME
 
-RUN bash -lc 'rvm install ruby-3.2.6'
-RUN bash -lc 'rvm --default use ruby-3.2.6'
+RUN bash -lc 'rvm install ruby-3.3.4'
+RUN bash -lc 'rvm --default use ruby-3.3.4'
 
 # Install bundle of gems
-RUN gem install bundler:2.5.6
+RUN gem update --system \
+ && gem install bundler:4.0.7 \
+ && gem uninstall bundler --version 2.5.11 --force --ignore-dependencies \
+ && gem install strscan:3.1.2 \
+ && gem uninstall strscan --version 3.0.9 --force --ignore-dependencies \
+ && gem install stringio:3.2.0 \
+ && gem uninstall stringio --version 3.1.1 --force --ignore-dependencies
 RUN gem install rake:13.2.1
 ADD Gemfile Gemfile
 ADD Gemfile.lock Gemfile.lock

Gemfile

@@ -4,22 +4,23 @@ source "https://rubygems.org"
 
 ruby RUBY_VERSION
 
-DECIDIM_VERSION = { git: "https://github.com/PopulateTools/decidim.git", branch: "tiptap-image-links_0.29" }.freeze
+DECIDIM_VERSION = { git: "https://github.com/PopulateTools/decidim.git", branch: "tiptap-image-links_0.30" }.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", git: "https://github.com/PopulateTools/decidim-module-decidim_awesome.git", branch: "autoblock_with_attachments_029"
+gem "decidim-decidim_awesome", git: "https://github.com/PopulateTools/decidim-module-decidim_awesome.git", branch: "autoblock_with_attachments_030"
 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-homepage_proposals", git: "https://github.com/PopulateTools/decidim-module_homepage_proposals.git", branch: "release/0.29-stable"
-gem "decidim-term_customizer", git: "https://github.com/PopulateTools/decidim-module-term_customizer", branch: "upgrade_0.29"
+gem "decidim-homepage_proposals", git: "https://github.com/PopulateTools/decidim-module_homepage_proposals.git", branch: "release/0.30-stable"
+gem "decidim-term_customizer", git: "https://github.com/Platoniq/decidim-module-term_customizer", branch: "main"
+
+gem "decidim-removable_authorizations", git: "https://github.com/PopulateTools/decidim-module-removable_authorizations.git", branch: "release/0.30-stable"
 
-gem "decidim-removable_authorizations", git: "https://github.com/PopulateTools/decidim-module-removable_authorizations.git", branch: "main"
 # Compatibility with decidim initiatives module
 gem "bootsnap"
 gem "deface"
@@ -31,9 +32,9 @@ gem "uglifier", ">= 1.3.0"
 gem "wicked_pdf"
 
 # Forced by production environment
-gem "base64", "0.1.1"
-gem "stringio", "3.0.1"
-gem "strscan", "3.0.1"
+gem "base64", "0.2.0"
+gem "stringio", "3.2.0"
+gem "strscan", "3.1.2"
 
 group :development, :test do
   gem "byebug", platform: :mri