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

Feat/update decidim v0.27.4 #548

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
2b805fe
feat: update decidim v0.27.3
ayuki-joto Aug 7, 2023
73e7f5f
feat: update decidim-comments v0.27.3
ayuki-joto Aug 7, 2023
ceac57f
feat: update decidim-comments v0.27.4
ayuki-joto Aug 8, 2023
9cfddd3
feat: add missing migrate file
ayuki-joto Aug 8, 2023
f6d4f83
feat: update locales
ayuki-joto Aug 8, 2023
5197479
fix: lint
ayuki-joto Aug 8, 2023
163d344
Fix specs
takahashim Aug 8, 2023
913d26f
rubocop
takahashim Aug 8, 2023
c9a6192
Add more locale items
takahashim Aug 8, 2023
33f90b3
Merge pull request #21 from codeforjapan/fix-rspec
ayuki-joto Aug 8, 2023
8d92297
Merge pull request #22 from codeforjapan/fix-locale-ja
ayuki-joto Aug 8, 2023
6a52e87
refactor: add imagemagick
ayuki-joto Aug 9, 2023
064cdbc
refactor: add imagemagick7.1.1.15
ayuki-joto Aug 9, 2023
4a5fab3
refactor: add decidim polis
ayuki-joto Aug 11, 2023
d239c03
fix: Dockerfile
ayuki-joto Aug 15, 2023
07b46e5
fix: command initialized error
ayuki-joto Aug 15, 2023
843194d
fix: add curl to container
ayuki-joto Aug 15, 2023
bfbfff3
fix: add libs
ayuki-joto Aug 21, 2023
a7340b6
refactor: add imagemagick dependencies
ayuki-joto Aug 21, 2023
9547580
Use decidim_awesome 0.9.3
takahashim Aug 21, 2023
7517472
Merge pull request #23 from codeforjapan/update-decidim_awesome
ayuki-joto Aug 21, 2023
ab92970
refactor: update secrets.yml
ayuki-joto Aug 21, 2023
e4cf4ab
Merge branch 'develop' of github.com:ayuki-joto/decidim-cfj into feat…
ayuki-joto Aug 28, 2023
2d2513c
Update config/initializes/decidim.rb
takahashim Aug 28, 2023
b249b46
rubocop
takahashim Aug 28, 2023
952ab54
remove duplicated definitions
takahashim Aug 28, 2023
40aba41
Merge pull request #25 from codeforjapan/fix-config-secrets
ayuki-joto Aug 29, 2023
4a45c4e
refactor: update secrets.yml params
ayuki-joto Aug 29, 2023
c3c07ab
refactor: change decidim-decidim_awesome version
ayuki-joto Aug 31, 2023
48efdd1
refactor: change decidim-decidim_awesome version lock
ayuki-joto Aug 31, 2023
59b433e
refactor: remove static apis
ayuki-joto Sep 11, 2023
01f9552
fix: error
ayuki-joto Sep 11, 2023
3b22357
refactor: remove index info
ayuki-joto Sep 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
run: |
sudo apt-get update -y
sudo apt-get -yqq install libpq-dev postgresql-client
- name: Set up Ruby 2.7
- name: Set up Ruby 3.0.6
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.0.6
bundler-cache: true
- name: Lint by RuboCop
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/rails-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,20 @@ jobs:
which convert
convert -version

- name: Set up Ruby 2.7
- name: Set up Ruby 3.0.6
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.0.6
bundler-cache: true

- name: setup Node
uses: actions/setup-node@v3
with:
node-version: 16.9.1
node-version: 16.13.0
cache: 'yarn'
- name: install yarn
run: |
npm i -g [email protected].5
npm i -g [email protected].15
yarn install --frozen-lockfile

- name: create assets precompile cache key
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,6 @@ pgadmin
/yarn-error.log
yarn-debug.log*
.yarn-integrity
public/sw.js
public/sw.js.map
app/views/static/api/*
6 changes: 6 additions & 0 deletions .rubocop_rails.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,9 @@ Rails/SkipsModelValidations:
Rails/Validation:
Include:
- decidim-*/app/models/**/*.rb

Rails/I18nLocaleAssignment:
Enabled: false

Lint/EmptyBlock:
Enabled: false
4 changes: 3 additions & 1 deletion .rubocop_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ AllCops:
- "node_modules/**/*"
- "bin/setup"
- "bin/update"
- "bin/webpack"
- "bin/webpack-dev-server"
- "db/migrate/*"
- "db/schema.rb"
- "decidim-comments/**/*"
Expand Down Expand Up @@ -73,7 +75,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
TargetRubyVersion: 3.0.6

RSpec:
Patterns:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.4
3.0.6
51 changes: 33 additions & 18 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,38 @@
FROM node:16.9.1-alpine as node

FROM ruby:2.7.4-alpine

RUN apk update \
&& apk add --no-cache --virtual build-dependencies \
build-base \
curl-dev \
FROM node:16.13.0-bullseye-slim as node

FROM ruby:3.0.6-slim-bullseye

# for build-dep
RUN echo "deb-src http://deb.debian.org/debian bullseye main" >> /etc/apt/sources.list
RUN echo "deb-src http://deb.debian.org/debian-security bullseye-security main" >> /etc/apt/sources.list
RUN echo "deb-src http://deb.debian.org/debian bullseye-updates main" >> /etc/apt/sources.list

RUN apt-get update && \
apt-get install -y --no-install-recommends \
build-essential \
libpq-dev \
postgresql-client \
libicu-dev \
libwebp-dev \
libopenjp2-7-dev \
librsvg2-dev \
libde265-dev \
git \
&& apk add --no-cache \
imagemagick \
postgresql-dev \
tzdata \
zip \
curl \
gcompat\
&& cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
wget && \
apt-get clean && \
apt-get autoremove

RUN apt build-dep -y imagemagick && \
wget https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-15.tar.gz && \
tar xf 7.1.1-15.tar.gz && \
cd ImageMagick-7* && \
./configure && \
make && \
make install && \
ldconfig

ENV YARN_VERSION=v1.22.5
ENV YARN_VERSION=v1.22.15

# node install
COPY --from=node /usr/local/bin/node /usr/local/bin/node
Expand All @@ -32,7 +48,7 @@ ARG RAILS_ENV="production"
ENV LANG=C.UTF-8 \
LC_ALL=C.UTF-8 \
BUNDLER_JOBS=4 \
BUNDLER_VERSION=2.2.18 \
BUNDLER_VERSION=2.2.33 \
APP_HOME=/app \
RAILS_ENV=${RAILS_ENV} \
RAILS_LOG_TO_STDOUT=true \
Expand All @@ -53,7 +69,6 @@ RUN gem install bundler:${BUNDLER_VERSION} \
&& bundle config --global jobs ${BUNDLER_JOBS} \
&& if [ "${RAILS_ENV}" = "production" ];then \
bundle install --without development test \
&& apk del --purge build-dependencies \
;else \
bundle install \
;fi
Expand Down
22 changes: 11 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ source "https://rubygems.org"

ruby RUBY_VERSION

gem "decidim", "0.26.5"
gem "decidim", "0.27.4"

gem "decidim-comments", path: "decidim-comments"

gem "decidim-decidim_awesome", git: "https://github.com/codeforjapan/decidim-module-decidim_awesome.git", branch: "v0.9.0-2023-03-30"
gem "decidim-decidim_awesome", git: "https://github.com/codeforjapan/decidim-module-decidim_awesome.git", branch: "v0.9.3-2023-08-31"

gem "decidim-term_customizer", git: "https://github.com/codeforjapan/decidim-module-term_customizer.git", branch: "026-ja"
gem "decidim-term_customizer", git: "https://github.com/codeforjapan/decidim-module-term_customizer.git", branch: "027-ja"

gem "decidim-polis", git: "https://github.com/takahashim/decidim-polis.git", branch: "update-0-26-5"
gem "decidim-polis", git: "https://github.com/codeforjapan/decidim-polis.git", branch: "update-0-27-4"

gem "bootsnap"

gem "puma", ">= 5.0.0"
gem "puma", ">= 5.6.2"
gem "puma_worker_killer"

gem "uglifier", "~> 4.1"

gem "faker", "~> 2.14"
gem "faker", "~> 3.2"

gem "wicked_pdf", "~> 2.1"

Expand All @@ -40,26 +40,26 @@ group :development, :test do
gem "byebug", "~> 11.0", platform: :mri
gem "figaro"

gem "decidim-dev", "0.26.5"
gem "decidim-dev", "0.27.4"
gem "dotenv-rails"
gem "factory_bot_rails"
gem "rspec-rails"
end

group :development do
gem "letter_opener_web", "~> 1.3"
gem "letter_opener_web", "~> 2.0"
gem "listen", "~> 3.1"
gem "rubocop-faker"
gem "spring", "~> 2.0"
gem "spring-watcher-listen", "~> 2.0"
gem "web-console", "~> 3.5"
gem "web-console", "~> 4.2"
end

group :production do
gem "aws-sdk-s3", require: false
gem "aws-xray-sdk", require: ["aws-xray-sdk/facets/rails/railtie"]
# gem "aws-xray-sdk", require: ["aws-xray-sdk/facets/rails/railtie"]
gem "fog-aws"
gem "oj", platform: :mri
# gem "oj", platform: :mri
gem "sidekiq", "6.4.2"
end

Expand Down
Loading