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.

Sign up for GitHub

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

Nd 580 upgrades #775

Merged
merged 3 commits into from
Dec 11, 2024
Merged

Nd 580 upgrades #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe8186d
Upgraded ruby in base image
laurentb4 Dec 5, 2024
96fc3e3
minor upgrade to gems:
laurentb4 Dec 11, 2024
53050be
ameded format version
laurentb4 Dec 11, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/format-code.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.2.6'
ruby-version: '3.3.6'

- name: Format code
env:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.6
3.3.6
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.2-alpine3.19
FROM ruby:3.3.6-alpine3.19

ARG UID=1001
ARG GROUP=app
Expand Down Expand Up @@ -35,7 +35,7 @@ ENV LANG='C.UTF-8' \
CLOUDWATCH_LINK=${CLOUDWATCH_LINK}

RUN apk add --no-cache --virtual .build-deps build-base && \
apk add --no-cache gcompat nodejs yarn mysql-dev mysql-client bash make bind shadow freeradius
apk add --no-cache gcompat nodejs yarn mysql-dev mysql-client bash make bind shadow freeradius libffi-dev musl-dev ruby-dev

RUN if [ "${BUILD_DEV}" = "true" ] ; then \
apk add --no-cache alpine-sdk ruby-dev; \
Expand Down
66 changes: 31 additions & 35 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ GEM
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jmespath (1.6.2)
json (2.7.2)
json (2.9.0)
jwt (2.4.1)
kaminari (1.2.2)
activesupport (>= 4.1.0)
Expand All @@ -174,7 +174,7 @@ GEM
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
language_server-protocol (3.17.0.3)
logger (1.6.1)
logger (1.6.2)
loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -187,7 +187,7 @@ GEM
matrix (0.4.2)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
minitest (5.25.1)
minitest (5.25.4)
multi_json (1.15.0)
multi_xml (0.6.0)
mysql2 (0.5.5)
Expand Down Expand Up @@ -222,8 +222,8 @@ GEM
omniauth (~> 2.0)
openssl (3.2.0)
orm_adapter (0.5.0)
parallel (1.24.0)
parser (3.3.1.0)
parallel (1.26.3)
parser (3.3.6.0)
ast (~> 2.4.1)
racc
psych (5.2.0)
Expand Down Expand Up @@ -279,7 +279,7 @@ GEM
i18n
rdoc (6.8.1)
psych (>= 4.0.0)
regexp_parser (2.9.1)
regexp_parser (2.9.3)
reline (0.5.11)
io-console (~> 0.5)
responders (3.1.1)
Expand All @@ -303,43 +303,36 @@ GEM
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.1)
rubocop (1.62.1)
rubocop (1.69.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.36.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.2)
parser (>= 3.3.0.4)
rubocop-capybara (2.20.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.25.1)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.36.2)
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
rubocop-govuk (4.16.1)
rubocop (= 1.62.1)
rubocop-ast (= 1.31.2)
rubocop-rails (= 2.24.1)
rubocop-govuk (5.0.4)
rubocop (= 1.69.0)
rubocop-ast (= 1.36.2)
rubocop-capybara (= 2.21.0)
rubocop-rails (= 2.27.0)
rubocop-rake (= 0.6.0)
rubocop-rspec (= 2.28.0)
rubocop-rails (2.24.1)
rubocop-rspec (= 3.2.0)
rubocop-rails (2.27.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop (>= 1.52.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.28.0)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
rubocop-rspec_rails (~> 2.28)
rubocop-rspec_rails (2.28.3)
rubocop (~> 1.40)
rubocop-rspec (3.2.0)
rubocop (~> 1.61)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
Expand All @@ -351,9 +344,10 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
securerandom (0.3.2)
selenium-webdriver (4.20.1)
securerandom (0.4.0)
selenium-webdriver (4.27.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -381,7 +375,9 @@ GEM
concurrent-ruby (~> 1.0)
tzinfo-data (1.2023.3)
tzinfo (>= 1.0.0)
unicode-display_width (2.5.0)
unicode-display_width (3.1.2)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
useragent (0.16.10)
warden (1.2.9)
rack (>= 2.0.9)
Expand All @@ -394,7 +390,7 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.9.0)
websocket (1.2.10)
websocket (1.2.11)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand Down Expand Up @@ -440,7 +436,7 @@ DEPENDENCIES
webmock

RUBY VERSION
ruby 3.2.6p234
ruby 3.3.6

BUNDLED WITH
2.3.3
Loading