Skip to content

Commit

Permalink
upgrade 27 (#133)
Browse files Browse the repository at this point in the history
* upgrade 27

* fix forms spec

* fix tests

* rubocop

* fix dependencies

* fix meetings_controller_spec

* fix tests

* fix rubocop, add locale

* webpack

* fix initiatives_controller spec

* standarize rspec conf

* fix consultations controller spec

* fix migrations

* fix test locales

* fix admin_manages_consultation_spec

* fix highlighted_scope_ids

* fix consultation_summary_spec

* updgrade packages

* fixes part 1

* update awesome

* fix scopes

* fix default scopes

* fix scooper

* fix consultation

* fix process filters path

* use marketing for google analytics

---------

Co-authored-by: Ivan Vergés <[email protected]>
  • Loading branch information
antopalidi and microstudi authored Mar 19, 2024
1 parent c618da5 commit e88a675
Show file tree
Hide file tree
Showing 1,572 changed files with 466,568 additions and 19,022 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.7
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1

jobs:
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.7
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.0
RAILS_ENV: test
DATABASE_USERNAME: postgres
Expand All @@ -17,7 +17,7 @@ env:
jobs:
test:
name: RSpec
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
services:
postgres:
image: postgres:11
Expand All @@ -29,10 +29,14 @@ jobs:
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 1

- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: 119.0.6045.105

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,4 @@ yarn-debug.log*
# Ignore master key for decrypting credentials and more.
/config/master.key
/coverage
public/sw.js*
4 changes: 4 additions & 0 deletions .rubocop-disabled.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Style/FetchEnvVar:
Enabled: false
Rails/I18nLocaleAssignment:
Enabled: false
8 changes: 1 addition & 7 deletions .rubocop_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,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

# Indent private/protected/public as deep as method definitions
Layout/AccessModifierIndentation:
Expand Down Expand Up @@ -1751,4 +1746,3 @@ Faker/DeprecatedArguments:
questions:
- number
- supplemental

2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.7
3.0.6
15 changes: 9 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
FROM ruby:2.7 AS builder
FROM ruby:3.0 AS builder

RUN apt-get update && apt-get upgrade -y && apt-get install gnupg2 && \
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
RUN NODE_MAJOR=16 && \
apt-get update && apt-get upgrade -y && apt-get install -y ca-certificates curl gnupg && \
mkdir -p /etc/apt/keyrings && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
apt-get update && apt-get install -y nodejs yarn \
Expand Down Expand Up @@ -76,7 +79,7 @@ RUN mv config/credentials.bak config/credentials 2>/dev/null || true
RUN rm -rf node_modules tmp/cache vendor/bundle test spec app/packs .git

# This image is for production env only
FROM ruby:2.7-slim AS final
FROM ruby:3.0-slim AS final

RUN apt-get update && \
apt-get install -y postgresql-client \
Expand Down Expand Up @@ -107,7 +110,7 @@ RUN addgroup --system --gid 1000 app && \

WORKDIR /app
COPY ./entrypoint.sh /app/entrypoint.sh
COPY ./supervisord.conf /etc/supervisord.conf
COPY ./supervisord.conf /etc/supervisord.conf
COPY --from=builder --chown=app:app /usr/local/bundle/ /usr/local/bundle/
COPY --from=builder --chown=app:app /app /app

Expand All @@ -117,4 +120,4 @@ HEALTHCHECK --interval=1m --timeout=5s --start-period=30s \


ENTRYPOINT ["/app/entrypoint.sh"]
CMD ["/usr/bin/supervisord"]
CMD ["/usr/bin/supervisord"]
25 changes: 12 additions & 13 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = { github: "decidim/decidim", branch: "release/0.26-stable" }.freeze
DECIDIM_VERSION = { github: "decidim/decidim", branch: "release/0.27-stable" }.freeze

gem "codit-devise-cas-authenticable", github: "Som-Energia/codit-devise-cas-authenticable"
gem "decidim", DECIDIM_VERSION
Expand All @@ -14,36 +14,35 @@ gem "decidim-initiatives", DECIDIM_VERSION
gem "decidim-templates", DECIDIM_VERSION

# A Decidim module to customize the localized terms in the system.
gem "decidim-term_customizer", github: "mainio/decidim-module-term_customizer", branch: "release/0.26-stable"
gem "decidim-term_customizer", github: "mainio/decidim-module-term_customizer", branch: "release/0.27-stable"

# Usability and UX tweaks for Decidim.
gem "decidim-action_delegator", "~> 0.7.0"
gem "decidim-action_delegator", github: "coopdevs/decidim-module-action_delegator"
gem "decidim-decidim_awesome", github: "decidim-ice/decidim-module-decidim_awesome"
gem "decidim-reporting_proposals", github: "openpoke/decidim-module-reporting-proposals"

gem "bootsnap", "~> 1.7"
gem "deface"
gem "puma", ">= 5.3.1"

gem "wicked_pdf", "~> 2.1"
gem "puma"

gem "progressbar"
gem "wicked_pdf"

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

gem "brakeman"
gem "decidim-dev", DECIDIM_VERSION
end

group :development do
gem "letter_opener_web"
gem "listen", "~> 3.1"
gem "rubocop-faker"
gem "spring", ">= 4.0.0"
gem "spring-watcher-listen", "~> 2.1"
gem "web-console", "~> 4.2"
gem "listen"
gem "spring"
gem "spring-watcher-listen"
gem "web-console"
end

group :test do
Expand Down
Loading

0 comments on commit e88a675

Please sign in to comment.