diff --git a/.circleci/config.yml b/.circleci/config.yml index 7aded2af5..7051d643e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ defaults: &defaults CIRCLE_TEST_REPORTS: /tmp/circleci-test-results docker: # List of image tags: https://circleci.com/developer/images/image/cimg/ruby#image-tags - - image: cimg/ruby:3.1.2-browsers + - image: cimg/ruby:3.1.4-browsers environment: PGHOST: 127.0.0.1 PGUSER: circleci @@ -53,9 +53,18 @@ jobs: - v1-dep-main- - v1-dep- - run: - name: Update to Node v16.14.2 + name: Swap node versions command: | - curl https://www.npmjs.com/install.sh | sudo bash + set +e + wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.1/install.sh | bash + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" + nvm install v16.14 + nvm alias default 16.14 + + echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV - run: gem install bundler - run: bundle install --path=vendor/bundle --jobs=4 --retry=3 - run: yarn install --cache-folder ~/.cache/yarn @@ -74,6 +83,11 @@ jobs: - ./node_modules - ./vendor/bundle - run: dockerize -wait tcp://localhost:5432 -timeout 1m + - run: + name: Download libssl1.1 + command: | + wget http://nz2.archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.17_amd64.deb + sudo dpkg -i libssl1.1_1.1.1f-1ubuntu2.17_amd64.deb - run: command: bundle exec rake db:create db:schema:load --trace environment: @@ -88,14 +102,6 @@ jobs: set -e (cd client && yarn lint:flow && yarn lint:eslint && yarn test:circleci) (cd client && ../tmp/cc-test-reporter format-coverage -t lcov -o ../tmp/codeclimate.frontend.json coverage/lcov.info) - - run: - name: Run YAML linter - command: | - set -e - curl https://bootstrap.pypa.io/pip/3.5/get-pip.py -o get-pip.py - python3 get-pip.py --user - python3 -m pip install --user yamllint - cd config && yamllint locales/ - persist_to_workspace: root: tmp paths: 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 f0192f34f..323a147b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.1.2 +FROM ruby:3.1.4 RUN apt-get update -qq && \ apt-get install -y build-essential cmake git tzdata libpq-dev ruby-dev curl diff --git a/Gemfile b/Gemfile index 6d9cfcaed..9740a1a04 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # frozen_string_literal: true source 'https://rubygems.org' -ruby '~> 3.1.2' +ruby '~> 3.1.4' gem 'puma', '5.6.4' # Latest capybara doesn't work with puma 6.0 at the moment. gem 'rack-rewrite' @@ -104,7 +104,7 @@ group :test do gem 'database_cleaner' gem 'rails-controller-testing' gem 'shoulda-matchers', '~> 5.3.0' - gem 'simplecov', '~> 0.21.0' + gem 'simplecov', '~> 0.17.0' end group :production do diff --git a/Gemfile.lock b/Gemfile.lock index 1f17857f5..95cfc1c49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -247,12 +247,10 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) mini_mime (1.1.2) - mini_portile2 (2.8.1) minitest (5.17.0) mono_logger (1.1.0) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.1.1) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) net-imap (0.3.1) @@ -265,8 +263,9 @@ GEM net-protocol netrc (0.11.0) nio4r (2.5.8) - nokogiri (1.13.10) - mini_portile2 (~> 2.8.0) + nokogiri (1.14.3-arm64-darwin) + racc (~> 1.4) + nokogiri (1.14.3-x86_64-darwin) racc (~> 1.4) oauth2 (1.4.11) faraday (>= 0.17.3, < 3.0) @@ -365,7 +364,7 @@ GEM ruby-graphviz (~> 1.2) rails-html-sanitizer (1.4.4) loofah (~> 2.19, >= 2.19.1) - rails-i18n (6.0.0) + rails-i18n (7.0.6) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) rails_12factor (0.0.3) @@ -524,7 +523,7 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simplecov (0.21.2) + simplecov (0.17.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) @@ -584,6 +583,7 @@ GEM PLATFORMS arm64-darwin-21 + arm64-darwin-22 x86_64-darwin-20 DEPENDENCIES @@ -660,7 +660,7 @@ DEPENDENCIES sidekiq-cron (~> 1.1) sidekiq-failures sidekiq-middleware - simplecov (~> 0.21.0) + simplecov (~> 0.17.0) spring sprockets-rails turbolinks (~> 5.2.0) @@ -669,7 +669,7 @@ DEPENDENCIES webpacker RUBY VERSION - ruby 3.1.2p20 + ruby 3.1.4p223 BUNDLED WITH 2.3.24