feat!: Bump 0.27

.env-example

@@ -13,6 +13,18 @@ BACKUP_S3SYNC_ACCESS_KEY=
 BACKUP_S3SYNC_SECRET_KEY=
 BACKUP_S3SYNC_BUCKET=
 BACKUP_S3RETENTION_ENABLED=
+INITIATIVES_CREATION_ENABLED=
+INITIATIVES_SIMILARITY_THRESHOLD=
+INITIATIVES_SIMILARITY_LIMIT=
+INITIATIVES_MINIMUM_COMMITTEE_MEMBERS=
+INITIATIVES_DEFAULT_SIGNATURE_TIME_PERIOD_LENGTH=
+INITIATIVES_DEFAULT_COMPONENTS=
+INITIATIVES_FIRST_NOTIFICATION_PERCENTAGE=
+INITIATIVES_SECOND_NOTIFICATION_PERCENTAGE=
+INITIATIVES_STATS_CACHE_EXPIRATION_TIME=
+INITIATIVES_MAX_TIME_IN_VALIDATING_STATE=
+INITIATIVES_PRINT_ENABLED=
+INITIATIVES_DO_NOT_REQUIRE_AUTHORIZATION=
 SPAM_DETECTION_API_AUTH_TOKEN=
 SPAM_DETECTION_API_URL=
 SPAM_DETECTION_NAME=
@@ -47,4 +59,4 @@ TRANSLATOR_ENABLED=0
 TRANSLATOR_API_KEY=
 TRANSLATOR_HOST=
 TRANSLATOR_DELAY=0
-GALLERY_ANIMATION_ENABLE=0
+GALLERY_ANIMATION_ENABLE=0

.github/workflows/ci_cd.yml

@@ -5,7 +5,7 @@ env:
   CI: "true"
   SIMPLECOV: "true"
   RSPEC_FORMAT: "documentation"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.6
   RAILS_ENV: test
   NODE_VERSION: 16.9.1
   RUBYOPT: '-W:no-deprecated'
@@ -50,7 +50,7 @@ jobs:
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
           bundler-cache: true
-      - name: Create db
+      - name: Check for Zeitwerk errors
         run: |
           bundle exec rails zeitwerk:check
   tests:
@@ -216,50 +216,10 @@ jobs:
           database_host: ${{ env.DATABASE_HOST }}
           # We don't want to upload the image to the registry if the build fails, but we don't care when on a PR for speed reasons
           push: ${{ github.ref != 'refs/heads/develop' || github.ref != 'refs/heads/master' }}
-  deploy_develop:
-    if: "github.ref == 'refs/heads/develop'"
-    needs: [lint, tests, system_tests, test_build]
-    name: Deploy develop branch on develop instance
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run Ansible playbook
-        uses: appleboy/[email protected]
-        with:
-          host: ${{ secrets.ANSIBLE_HOST }}
-          username: ${{ secrets.ANSIBLE_USERNAME }}
-          key: ${{ secrets.ANSIBLE_KEY }}
-          port: ${{ secrets.SSH_PORT }}
-          script: ansible-playbook -u ${{ secrets.ANSIBLE_USERNAME }} --private-key="~/.ssh/ansible-deploy/ansible-deploy" -i /home/${{ secrets.ANSIBLE_USERNAME }}/ansible/decidim/inventories/develop.yml /home/${{ secrets.ANSIBLE_USERNAME }}/ansible/decidim/playbooks/update_decidim_app.yml
-  deploy_rc:
-    if: "github.ref == 'refs/heads/rc'"
-    needs: [lint, tests, system_tests, test_build]
-    name: Deploy rc branch on RC instance
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run Ansible playbook
-        uses: appleboy/[email protected]
-        with:
-          host: ${{ secrets.ANSIBLE_HOST }}
-          username: ${{ secrets.ANSIBLE_USERNAME }}
-          key: ${{ secrets.ANSIBLE_KEY }}
-          port: ${{ secrets.SSH_PORT }}
-          script: ansible-playbook -u ${{ secrets.ANSIBLE_USERNAME }} --private-key="~/.ssh/ansible-deploy/ansible-deploy" -i /home/${{ secrets.ANSIBLE_USERNAME }}/ansible/decidim/inventories/rc.yml /home/${{ secrets.ANSIBLE_USERNAME }}/ansible/decidim/playbooks/update_decidim_app.yml
-  deploy_staging:
-    if: "github.ref == 'refs/heads/master'"
-    needs: [lint, tests, system_tests, test_build]
-    name: Deploy staging branch on staging instance
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run Ansible playbook
-        uses: appleboy/[email protected]
-        with:
-          host: ${{ secrets.ANSIBLE_HOST }}
-          username: ${{ secrets.ANSIBLE_USERNAME }}
-          key: ${{ secrets.ANSIBLE_KEY }}
-          port: ${{ secrets.SSH_PORT }}
-          script: ansible-playbook -u ${{ secrets.ANSIBLE_USERNAME }} --private-key="~/.ssh/ansible-deploy/ansible-deploy" -i /home/${{ secrets.ANSIBLE_USERNAME }}/ansible/decidim/inventories/staging.yml /home/${{ secrets.ANSIBLE_USERNAME }}/ansible/decidim/playbooks/update_decidim_app.yml
   build_and_push_image_dev:
-    if: "github.ref == 'refs/heads/develop'"
+    if: "contains('
+      refs/heads/develop
+      refs/heads/rc/', github.ref)"
     name: Build and push image to Registry
     needs: [ lint, tests, system_tests, test_build ]
     runs-on: ubuntu-latest

.github/workflows/deploy_production.yml

@@ -4,7 +4,7 @@ on: [ workflow_dispatch ]
 env:
   CI: "true"
   SIMPLECOV: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.6
   RAILS_ENV: test
   NODE_VERSION: 16.9.1
   RUBYOPT: '-W:no-deprecated'

.gitignore

@@ -95,3 +95,4 @@ yarn-debug.log*
 .yarn-integrity
 .idea
 coverage/
+public/sw.js*

.rubocop_rails.yml

@@ -94,6 +94,9 @@ Rails/Validation:
   Include:
     - app/models/**/*.rb
 
+Rails/CompactBlank:
+  Enabled: false
+
 Rails/BulkChangeTable:
   Exclude:
     - db/**/*

.rubocop_ruby.yml

@@ -16,6 +16,7 @@ AllCops:
     - "vendor/**/*"
     - "node_modules/**/*"
     - "db/schema.rb"
+    - "db/migrate/*.rb"
     - "bin/*"
   # Default formatter will be used if no -f/--format option is given.
   DefaultFormatter: progress
@@ -67,12 +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
-
-  RSpec:
-    Patterns:
-      - "(?:^|/)spec/"
-      - "(?:^|/)test/"
+  TargetRubyVersion: 3.0
 
 Lint/SafeNavigationChain:
   Exclude:
@@ -287,6 +283,9 @@ Style/HashEachMethods:
 Style/HashLikeCase:
   MinBranchesCount: 5
 
+Style/OpenStructUse:
+  Enabled: false
+
 # Indentation of `when`.
 Layout/CaseIndentation:
   EnforcedStyle: case
@@ -1272,10 +1271,11 @@ RSpec/NamedSubject:
   Enabled: false
 
 RSpec/RepeatedExampleGroupDescription:
-  Enabled: false
+  Enabled: true
 
 RSpec/RepeatedExampleGroupBody:
-  Enabled: false
+  Enabled: true
+
 RSpec/VerifiedDoubles:
   Enabled: false
 

.ruby-version

@@ -1 +1 @@
-2.7.5
+3.0.6

Dockerfile

@@ -1,16 +1,20 @@
-FROM rg.fr-par.scw.cloud/decidim-app-base/decidim-app-base:2.7.5-alpine-jemalloc as builder
+FROM ruby:3.0.6-slim as builder
 
 ENV RAILS_ENV=production \
     SECRET_KEY_BASE=dummy
 
 WORKDIR /app
 
-# TODO: Use repository version of jemalloc when available
-RUN apk add --no-cache --update nodejs yarn tzdata git icu-dev libpq-dev build-base proj proj-dev postgresql-client imagemagick && \
+RUN apt-get update && \
+    apt-get -y install libpq-dev curl git libicu-dev build-essential && \
+    curl https://deb.nodesource.com/setup_16.x | bash && \
+    apt-get install -y nodejs  && \
+    npm install --global yarn && \
     gem install bundler:2.4.9
 
 COPY Gemfile* ./
-RUN bundle config set --local without 'development test' && bundle install
+RUN bundle config set --local without 'development test' && \
+    bundle install -j"$(nproc)"
 
 COPY package* ./
 COPY yarn.lock .
@@ -30,22 +34,22 @@ RUN rm -rf node_modules tmp/cache vendor/bundle spec \
     && find /usr/local/bundle/gems/ -type d -name "spec" -prune -exec rm -rf {} \; \
     && rm -rf log/*.log
 
-FROM ruby:2.7.5-alpine as runner
+FROM ruby:3.0.6-slim as runner
 
 ENV RAILS_ENV=production \
     SECRET_KEY_BASE=dummy \
     RAILS_LOG_TO_STDOUT=true
 
-RUN apk add --no-cache --update icu-dev tzdata postgresql-client proj proj-dev imagemagick  && \
+RUN apt update && \
+    apt install -y postgresql-client imagemagick libproj-dev proj-bin libjemalloc2 && \
     gem install bundler:2.4.9
 
 WORKDIR /app
 
-COPY --from=builder /usr/local/lib/libjemalloc.so.2 /usr/local/lib/
 COPY --from=builder /usr/local/bundle /usr/local/bundle
 COPY --from=builder /app /app
 
-ENV LD_PRELOAD=/usr/local/lib/libjemalloc.so.2 \
+ENV LD_PRELOAD="libjemalloc.so.2" \
     MALLOC_CONF="background_thread:true,metadata_thp:auto,dirty_decay_ms:5000,muzzy_decay_ms:5000,narenas:2"
 
 EXPOSE 3000

Gemfile

@@ -2,29 +2,31 @@
 
 source "https://rubygems.org"
 
-DECIDIM_VERSION = "0.26"
-DECIDIM_BRANCH = "release/#{DECIDIM_VERSION}-stable"
+DECIDIM_VERSION = "0.27"
+DECIDIM_BRANCH = "release/#{DECIDIM_VERSION}-stable".freeze
 
 ruby RUBY_VERSION
 
-# Many gems depend on environment variables, so we load them as soon as possible
-gem "dotenv-rails", require: "dotenv/rails-now"
-
 # Core gems
 gem "decidim", "~> #{DECIDIM_VERSION}.0"
 gem "decidim-conferences", "~> #{DECIDIM_VERSION}.0"
+gem "decidim-initiatives", "~> #{DECIDIM_VERSION}.0"
 gem "decidim-templates", "~> #{DECIDIM_VERSION}.0"
 
 # External Decidim gems
 gem "decidim-cache_cleaner"
 gem "decidim-decidim_awesome"
+gem "decidim-extended_socio_demographic_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module-extended_socio_demographic_authorization_handler.git",
+                                                                branch: DECIDIM_BRANCH
+gem "decidim-extra_user_fields", git: "https://github.com/paulinebessoles/decidim-module-extra_user_fields", branch: "feat/add_tests_0_27"
 gem "decidim-friendly_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-friendly_signup.git"
-gem "decidim-gallery"
+# TODO: Bump to 0.27.0 when released
+# gem "decidim-gallery"
 gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: DECIDIM_BRANCH
 gem "decidim-ludens", git: "https://github.com/OpenSourcePolitics/decidim-ludens.git", branch: DECIDIM_BRANCH
 gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: DECIDIM_BRANCH
 gem "decidim-spam_detection"
-gem "decidim-term_customizer", git: "https://github.com/armandfardeau/decidim-module-term_customizer.git", branch: "fix/precompile-on-docker-0.26"
+gem "decidim-term_customizer", git: "https://github.com/armandfardeau/decidim-module-term_customizer.git", branch: "fix/precompile-on-docker"
 
 # Omniauth gems
 gem "omniauth-france_connect", git: "https://github.com/OpenSourcePolitics/omniauth-france_connect"
@@ -35,6 +37,8 @@ gem "activejob-uniqueness", require: "active_job/uniqueness/sidekiq_patch"
 gem "aws-sdk-s3", require: false
 gem "bootsnap", "~> 1.4"
 gem "deepl-rb", require: "deepl"
+gem "deface"
+gem "dotenv-rails", "~> 2.7"
 gem "faker", "~> 2.14"
 gem "fog-aws"
 gem "foundation_rails_helper", git: "https://github.com/sgruhier/foundation_rails_helper.git"