Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .codeship/rubygems-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.4.12
2 changes: 1 addition & 1 deletion .codeship/setup.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

gem update --system 3.4.12
gem update --system "$(cat .codeship/rubygems-version)"
gem install bundler:2.4.12

bundle _2.4.12_ install
Expand Down
8 changes: 8 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ Metrics/MethodLength:
Metrics/PerceivedComplexity:
Max: 10

Naming/PredicateMethod:
AllowedMethods:
- call
- save

Naming/MethodParameterName:
MinNameLength: 2

Expand Down Expand Up @@ -84,3 +89,6 @@ Style/PercentLiteralDelimiters:

Style/RescueModifier:
Enabled: false

Style/SafeNavigationChainLength:
Max: 3
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.1
3.2.9
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Bump ruby to 3.2.9
- [BREAKING] Update CKEditor version (see [CKEditor usage](docs/ckeditor-usage.md)) - [@paranoicsan](https://github.com/paranoicsan)
- [BREAKING] Refactor query handling in admin controllers - [@paranoicsan](https://github.com/paranoicsan)
- [BREAKING] Rename `import_status_for` to `import_status_for_nested` inside `Lcms::Engine::NestedReimportable` - [@paranoicsan](https://github.com/paranoicsan)
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.2.1
FROM ruby:3.2.9

ENV APP_PATH=/app/
ENV LANG=C.UTF-8
Expand All @@ -11,14 +11,14 @@ RUN apt-get autoclean \
&& apt-get install -y --no-install-recommends \
build-essential \
chromium-driver \
postgresql-client-13 \
postgresql-client \
shellcheck \
tzdata \
&& rm -r /var/lib/apt/lists/* /var/cache/apt/*

# install specific wkhtmltopdf binary
RUN apt-get update -qqy \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need wkhtmltopdf here and not chrome?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because lcms-engine doesn't depends on it. But still does on wkhtnltopdf 🤷🏻‍♂️

&& WK_VERSION=0.12.6.1-2 \
&& WK_VERSION=0.12.6.1-3 \
&& ARCH=$(dpkg --print-architecture) \
&& CODENAME=$(. /etc/os-release; echo $VERSION_CODENAME) \
&& curl -LSfso wkhtmltopdf.deb https://github.com/wkhtmltopdf/packaging/releases/download/$WK_VERSION/wkhtmltox_$WK_VERSION.${CODENAME}_$ARCH.deb \
Expand Down
8 changes: 0 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ gemspec
# To use a debugger
# gem 'byebug', group: [:development, :test]

gem 'lt-google-api', github: 'learningtapestry/lt-google-api',
branch: 'ruby-3-upgrade',
ref: '08cece7'

gem 'lt-lcms', github: 'learningtapestry/lt-lcms',
branch: 'ruby-3-upgrade',
ref: 'a673e78'

gem 'wicked_pdf', github: 'learningtapestry/wicked_pdf',
branch: 'puppeteer-support',
ref: '50d961e'
Loading