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

[6078] Bump ruby to 3.2.2 #3633

Merged
merged 10 commits into from
Nov 15, 2023
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
51 changes: 43 additions & 8 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,43 @@
log
tmp
.git
.github
terraform
.terraform
tfplan
Dockerfile
# See https://docs.docker.com/engine/reference/builder/#dockerignore-file for more about ignoring files.

# Ignore git directory.
/.git/
/.github

# Ignore terraform stuff
/.terraform
/terraform
/tfplan

# Ignore bundler config.
/.bundle

# Ignore all default key files.
/config/master.key
/config/credentials/*.key

# Ignore all environment files.
/.env*
!/.env.example

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/.keep

# Ignore storage (uploaded files in development and any SQLite databases).
/storage/*
!/storage/.keep
/tmp/storage/*
!/tmp/storage/.keep

# Ignore assets.
/node_modules/
/app/assets/builds/*
!/app/assets/builds/.keep
/public/assets
4 changes: 2 additions & 2 deletions .github/actions/smoke-test_v2/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ inputs:
runs:
using: composite
steps:
- name: Set up Ruby 3.1.3
- name: Set up Ruby 3.2.2
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.3
ruby-version: 3.2.2

# base_url is set in config_settings for non-review apps and will need to be overriden for aks non-review
- name: Set Environment variables
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ inherit_from:
- .rubocop_todo.yml

AllCops:
TargetRubyVersion: 3.1
TargetRubyVersion: 3.2
NewCops: enable
Exclude:
- "bin/*"
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
nodejs 16.14.0
ruby 3.1.3
ruby 3.2.2
yarn 1.22.19
bundler 2.4.16
terraform 1.3.5
Expand Down
Binary file added .yarn/install-state.gz
Binary file not shown.
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
17 changes: 7 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1.3-alpine3.15
FROM ruby:3.2.2-alpine3.18

ENV APP_HOME /app
RUN mkdir $APP_HOME
Expand All @@ -17,22 +17,19 @@ RUN apk add --update --no-cache --virtual build-dependances \
rm -rf /usr/local/bundle/cache && \
apk del build-dependances

# Remove once base image ruby:3.1.3-alpine3.15 has been updated with latest libraries
RUN apk add --no-cache ncurses-libs=6.3_p20211120-r2 pkgconf=1.8.1-r0

COPY package.json yarn.lock ./
RUN yarn install --frozen-lockfile && \
yarn cache clean
RUN yarn install --frozen-lockfile --ignore-scripts

COPY . .

# Precompile bootsnap code for faster boot times
RUN bundle exec bootsnap precompile app/ lib/

RUN echo export PATH=/usr/local/bin:\$PATH > /root/.ashrc
ENV ENV="/root/.ashrc"

RUN yarn build && \
yarn build:css && \
bundle exec rake assets:precompile && \
rm -rf node_modules tmp
# Precompiling assets for production without requiring secret RAILS_MASTER_KEY
RUN SECRET_KEY_BASE=DUMMY ./bin/rails assets:precompile

ARG COMMIT_SHA
ENV COMMIT_SHA=$COMMIT_SHA
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.1.3"
ruby "3.2.2"

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem "rails", "~> 7.0"
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ DEPENDENCIES
webmock

RUBY VERSION
ruby 3.1.3p185
ruby 3.2.2p53

BUNDLED WITH
2.4.16
4 changes: 2 additions & 2 deletions app/services/progress_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

class ProgressService
class << self
def call(**args)
new(**args)
def call(**)
new(**)
end
end

Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"engines": {
"node": "16.x"
"node": "18.x"
},
"scripts": {
"js:lint": "standard",
Expand Down Expand Up @@ -55,5 +55,6 @@
"stylelint": {
"extends": "stylelint-config-gds/scss"
},
"license": "MIT"
"license": "MIT",
"packageManager": "yarn@4.0.1"
}
4 changes: 2 additions & 2 deletions spec/support/features/trainee_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ module Features
module TraineeSteps
attr_reader :trainee

def given_a_trainee_exists(*traits, **overrides)
@trainee ||= create(:trainee, *traits, **overrides, provider: current_user.organisation)
def given_a_trainee_exists(*, **)
@trainee ||= create(:trainee, *, **, provider: current_user.organisation)
end

def trainee_from_url
Expand Down