Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade 27 #133

Merged
merged 28 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3a1935d
upgrade 27
antopalidi Sep 25, 2023
ae822c9
fix forms spec
antopalidi Sep 25, 2023
da96642
fix tests
antopalidi Sep 25, 2023
1c2f417
rubocop
antopalidi Sep 26, 2023
6830db4
fix dependencies
microstudi Sep 26, 2023
d657c91
fix meetings_controller_spec
antopalidi Sep 26, 2023
a44176c
fix tests
antopalidi Sep 26, 2023
a73ff47
fix rubocop, add locale
antopalidi Sep 26, 2023
460e846
webpack
antopalidi Sep 27, 2023
1e3a0bb
fix initiatives_controller spec
antopalidi Sep 27, 2023
8e7f65b
standarize rspec conf
microstudi Sep 27, 2023
8152f04
fix consultations controller spec
antopalidi Sep 27, 2023
688c7f4
fix migrations
microstudi Sep 27, 2023
3280418
fix test locales
microstudi Sep 27, 2023
01e68c9
fix admin_manages_consultation_spec
antopalidi Sep 28, 2023
9aa6a6c
fix highlighted_scope_ids
antopalidi Sep 28, 2023
f7092e0
fix consultation_summary_spec
antopalidi Sep 28, 2023
1daf0aa
Merge branch 'main' into upgrade-27
microstudi Oct 16, 2023
382595c
Merge branch 'upgrade-27' of github.com:Som-Energia/decidim-som-energ…
microstudi Oct 16, 2023
8ae149a
updgrade packages
microstudi Nov 14, 2023
81c0278
fixes part 1
microstudi Nov 16, 2023
a2490ab
update awesome
microstudi Nov 21, 2023
aaa81fe
fix scopes
microstudi Jan 10, 2024
cab9dbc
fix default scopes
microstudi Jan 10, 2024
cffece1
fix scooper
microstudi Jan 10, 2024
17fcdb1
fix consultation
microstudi Jan 10, 2024
9fcf7e0
fix process filters path
microstudi Jan 11, 2024
e92ab3d
use marketing for google analytics
microstudi Jan 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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
Loading