Upgrade Decidim to v0.30

.github/workflows/linters.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.2.9
+  RUBY_VERSION: 3.3.4
 
 jobs:
   test-report:
@@ -37,19 +37,6 @@ jobs:
       - name: Set bundle local config configvendor/bundle path
         run: bundle config set --local path 'vendor/bundle'
 
-      # chromedriver workaround
-      - uses: nanasess/setup-chromedriver@v2
-        with:
-          chromedriver-version: 119.0.6045.105
-
-      - name: List Chrome
-        shell: "bash"
-        run: apt list --installed | grep chrome
-
-      - name: Remove Chrome
-        shell: "bash"
-        run: sudo apt remove google-chrome-stable
-
       - name: Install ImageMagick
         shell: "bash"
         run: |

.github/workflows/test-process_extended.yml

@@ -9,15 +9,15 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.2.9
+  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
@@ -40,65 +40,42 @@ jobs:
           ruby-version: ${{ env.RUBY_VERSION }}
 
       - name: Recover Ruby dependency cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
-          path: ./vendor/bundle
-          key: ${{ runner.OS }}-rubydeps-${{ hashFiles('Gemfile.lock') }}
+          path: decidim-process-extended/vendor/bundle
+          key: ${{ runner.OS }}-rubydeps-process-extended-v2-${{ env.RUBY_VERSION }}-${{ hashFiles('decidim-process-extended/Gemfile.lock') }}
           restore-keys: |
-            ${{ runner.OS }}-rubydeps-${{ env.cache-name }}-
-            ${{ runner.OS }}-rubydeps-
-            ${{ runner.OS }}-
+            ${{ runner.OS }}-rubydeps-process-extended-v2-${{ env.RUBY_VERSION }}-
 
-      - name: Set bundle local config configvendor/bundle path
+      - name: Set bundle local config vendor/bundle path
+        working-directory: "decidim-process-extended"
         run: bundle config set --local path 'vendor/bundle'
 
-      # chromedriver workaround
-      - uses: nanasess/setup-chromedriver@v2
-        with:
-          chromedriver-version: 119.0.6045.105
-
-      - name: List Chrome
-        shell: "bash"
-        run: apt list --installed | grep chrome
-
-      - name: Remove Chrome
-        shell: "bash"
-        run: sudo apt remove google-chrome-stable
-
-      - uses: browser-actions/setup-chrome@v1
-        with:
-          chrome-version: 119.0.6045.105
-
       - name: Install ImageMagick
         run: sudo apt update && sudo apt install imagemagick
 
       - name: Install Ruby deps
-        uses: nick-fields/retry@v3
-        with:
-          working-directory: "decidim-process-extended"
-          timeout_minutes: 10
-          max_attempts: 3
-          retry_on: error
-          command: bundle install --jobs 4 --retry 3
+        working-directory: "decidim-process-extended"
+        run: bundle install --jobs 4 --retry 3
 
       - name: Disable Spring
         run: echo "DISABLE_SPRING=1" >> $GITHUB_ENV
 
-      - name: Create empty application.yml
-        run: touch config/application.yml
-
       - name: Generate process_extended test_app
+        working-directory: "decidim-process-extended"
         run: bundle exec rake test_app
         shell: "bash"
-        with:
-          working-directory: "decidim-process-extended"
-
+
+      - name: Copy and run migrations to test_app
+        run: cd decidim-process-extended/spec/decidim_dummy_app && 
+          bundle exec rake decidim_process_extended:install:migrations &&
+          bundle exec rake db:migrate RAILS_ENV=test
+
       - name: Run RSpec
         uses: nick-fields/retry@v3
-        shell: "bash"
         with:
-          working-directory: "decidim-process-extended"
+          shell: "bash"
           timeout_minutes: 10
           max_attempts: 3
           retry_on: error
-          command: bundle exec rspec --backtrace
+          command: cd decidim-process-extended && bundle exec rspec --backtrace

.github/workflows/test-recaptcha.yml

@@ -9,15 +9,15 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.2.9
+  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
@@ -52,23 +52,6 @@ jobs:
       - name: Set bundle local config configvendor/bundle path
         run: bundle config set --local path 'vendor/bundle'
 
-      # chromedriver workaround
-      - uses: nanasess/setup-chromedriver@v2
-        with:
-          chromedriver-version: 119.0.6045.105
-
-      - name: List Chrome
-        shell: "bash"
-        run: apt list --installed | grep chrome
-
-      - name: Remove Chrome
-        shell: "bash"
-        run: sudo apt remove google-chrome-stable
-
-      - uses: browser-actions/setup-chrome@v1
-        with:
-          chrome-version: 119.0.6045.105
-
       - name: Install ImageMagick
         run: sudo apt update && sudo apt install imagemagick
 

.github/workflows/test-top_comments.yml

@@ -9,15 +9,15 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.2.9
+  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
@@ -52,23 +52,6 @@ jobs:
       - name: Set bundle local config configvendor/bundle path
         run: bundle config set --local path 'vendor/bundle'
 
-      # chromedriver workaround
-      - uses: nanasess/setup-chromedriver@v2
-        with:
-          chromedriver-version: 119.0.6045.105
-
-      - name: List Chrome
-        shell: "bash"
-        run: apt list --installed | grep chrome
-
-      - name: Remove Chrome
-        shell: "bash"
-        run: sudo apt remove google-chrome-stable
-
-      - uses: browser-actions/setup-chrome@v1
-        with:
-          chrome-version: 119.0.6045.105
-
       - name: Install ImageMagick
         run: sudo apt update && sudo apt install imagemagick
 

.github/workflows/test.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.2.9
+  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
@@ -64,23 +64,6 @@ jobs:
       - name: Set bundle local config configvendor/bundle path
         run: bundle config set --local path 'vendor/bundle'
 
-      # chromedriver workaround
-      - uses: nanasess/setup-chromedriver@v2
-        with:
-          chromedriver-version: 119.0.6045.105
-
-      - name: List Chrome
-        shell: "bash"
-        run: apt list --installed | grep chrome
-
-      - name: Remove Chrome
-        shell: "bash"
-        run: sudo apt remove google-chrome-stable
-
-      - uses: browser-actions/setup-chrome@v1
-        with:
-          chrome-version: 119.0.6045.105
-
       - name: Install ImageMagick
         run: sudo apt update && sudo apt install imagemagick
 
@@ -96,9 +79,7 @@ jobs:
         run: touch config/application.yml
 
       - name: Setup database
-        run: |
-          RAILS_ENV=test bundle exec rake db:create
-          RAILS_ENV=test bundle exec rake db:migrate
+        run: RAILS_ENV=test bundle exec rake db:create db:schema:load
 
       - name: Run RSpec
         uses: nick-fields/retry@v3

.github/workflows/validate_migrations.yml

@@ -12,14 +12,14 @@ env:
   DB_DATABASE: app
   DB_USERNAME: postgres
   DB_PASSWORD: postgres
-  RUBY_VERSION: 3.2.9
+  RUBY_VERSION: 3.3.4
 
 jobs:
   test:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:11
+        image: postgres:14
         ports: ["5432:5432"]
         options: >-
           --health-cmd pg_isready

.gitignore

@@ -36,6 +36,7 @@ public/assets
 public/decidim-packs/
 public/sw.js.*
 public/sw.js
+/public/sw.js*
 
 # Ignore test app
 spec/decidim_dummy_app/

.ruby-version

@@ -1 +1 @@
-3.2.9
+3.3.4

Gemfile

@@ -3,18 +3,17 @@
 source "https://rubygems.org"
 
 ruby RUBY_VERSION
-DECIDIM_VERSION = { git: "https://github.com/CodiTramuntana/decidim", branch: "release/0.29-stable" }.freeze
+DECIDIM_VERSION = { git: "https://github.com/CodiTramuntana/decidim", branch: "release/0.30-stable" }.freeze
 
 gem "decidim", DECIDIM_VERSION
 gem "decidim-templates", DECIDIM_VERSION
 
-gem "decidim-cdtb", git: "https://github.com/CodiTramuntana/decidim-module-cdtb.git", branch: "chore/rework_cdtb_rack_attack_to_parse_ips_as_expected"
-gem "decidim-challenges", "~> 0.7.4"
-gem "decidim-department_admin", git: "https://github.com/gencat/decidim-module-department_admin", tag: "v0.10.1"
-gem "decidim-idcat_mobil", "~> 0.7.2"
-# PR pending to merge in mainio repo: https://github.com/mainio/decidim-module-term_customizer/pull/125
-gem "decidim-term_customizer", git: "https://github.com/CodiTramuntana/decidim-module-term_customizer.git", branch: "upgrade/decidim_0.29"
-gem "decidim-verifications-members_picker", github: "gencat/decidim-verifications-members_picker", tag: "v0.2.0"
+gem "decidim-cdtb", "~> 0.5.6"
+gem "decidim-challenges", git: "https://github.com/gencat/decidim-module-challenges", branch: "upgrade/release-0.30"
+gem "decidim-department_admin", git: "https://github.com/gencat/decidim-module-department_admin", branch: "upgrade/release-0.30"
+gem "decidim-idcat_mobil", "~> 0.8.2"
+gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git", branch: "main"
+gem "decidim-verifications-members_picker", github: "gencat/decidim-verifications-members_picker", branch: "upgrade/release-0.30"
 
 # Internal modules
 gem "decidim-home", path: "decidim-home"
@@ -29,7 +28,7 @@ gem "stringio", "~> 3.1.7"
 gem "puma"
 
 # https://github.com/hlascelles/figjam
-gem "figjam"
+gem "figjam", "~> 3.0.1"
 gem "wkhtmltopdf-binary"
 
 gem "daemons"