diff --git a/.github/workflows/production_pipeline.yml b/.github/workflows/production_pipeline.yml index 7c0eaca52..fd0a73b9d 100644 --- a/.github/workflows/production_pipeline.yml +++ b/.github/workflows/production_pipeline.yml @@ -68,7 +68,7 @@ jobs: uses: actions/setup-node@v3 with: cache: yarn - node-version: 16 + node-version: 18 - name: Create database run: | @@ -127,7 +127,7 @@ jobs: uses: actions/setup-node@v3 with: cache: yarn - node-version: 16 + node-version: 18 - name: Create database run: | diff --git a/.github/workflows/staging_pipeline.yml b/.github/workflows/staging_pipeline.yml index a5b8cc58a..06f22632b 100644 --- a/.github/workflows/staging_pipeline.yml +++ b/.github/workflows/staging_pipeline.yml @@ -60,7 +60,7 @@ jobs: uses: actions/setup-node@v3 with: cache: yarn - node-version: 16 + node-version: 18 - name: Create database run: | @@ -118,7 +118,7 @@ jobs: uses: actions/setup-node@v3 with: cache: yarn - node-version: 16 + node-version: 18 - name: Create database run: | @@ -149,7 +149,7 @@ jobs: uses: actions/setup-node@v3 with: cache: yarn - node-version: 16 + node-version: 18 - name: Install packages and symlink local dependencies run: | diff --git a/.nvmrc b/.nvmrc index b6a7d89c6..3c032078a 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16 +18 diff --git a/.ruby-version b/.ruby-version index ef538c281..0aec50e6e 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.2 +3.1.4 diff --git a/Dockerfile b/Dockerfile index 65db290a7..43479ee9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build compilation image -FROM ruby:3.1.2-alpine as builder +FROM ruby:3.1.4-alpine as builder # The application runs from /app WORKDIR /app @@ -45,7 +45,7 @@ RUN rm -rf node_modules log tmp && \ find /usr/local/bundle/gems -name "*.html" -delete # Build runtime image -FROM ruby:3.1.2-alpine as production +FROM ruby:3.1.4-alpine as production # The application runs from /app WORKDIR /app diff --git a/Dockerfile_dev b/Dockerfile_dev index 086e874ba..e80f1d816 100644 --- a/Dockerfile_dev +++ b/Dockerfile_dev @@ -1,5 +1,5 @@ # Build compilation image -FROM ruby:3.1.2-alpine +FROM ruby:3.1.4-alpine # The application runs from /app WORKDIR /app diff --git a/Gemfile b/Gemfile index 229ae16e6..dacc8458d 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.1.2" +ruby "3.1.4" # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main' gem "rails", "~> 7.0.2" diff --git a/Gemfile.lock b/Gemfile.lock index 50fbe0b49..be93cd4b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -501,7 +501,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 3.1.2p20 + ruby 3.1.4p223 BUNDLED WITH 2.3.14 diff --git a/app/components/bulk_upload_error_row_component.html.erb b/app/components/bulk_upload_error_row_component.html.erb index 54a2c6c93..edf480a1a 100644 --- a/app/components/bulk_upload_error_row_component.html.erb +++ b/app/components/bulk_upload_error_row_component.html.erb @@ -1,13 +1,13 @@ -