Skip to content

Commit

Permalink
Upgrade Ruby 3.3.0, node 20 (#194)
Browse files Browse the repository at this point in the history
* Test 3.2.2@whatsopt: nok

* Set ruby version

* Rebase ruby-3.2.2

* Upgrade ruby 3.3.0

* Upgrade ruby in CI

* Upgrade to node 20

* Use ruby 3.3.0 n deploy

* Add matrix dependency

* Update ruby in production

* Update codacy badge

* Fix rswag deprecation warnings

* Update rails

* Bundle update

* Update pagy gem

* Upgrade js deps major versions

* Ignore sqlite files

* Fix analyseSensitivity api usage

* Bump 1.30.0

* Fix shakapacker deprecation in CI action

* Fix dev machine name

* Add egobox py dependency, relax openturns version
  • Loading branch information
relf authored Mar 22, 2024
1 parent e30f469 commit ae0db72
Show file tree
Hide file tree
Showing 19 changed files with 2,820 additions and 2,571 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Ruby and install gems
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0.3'
ruby-version: '3.3.0'
bundler-cache: true

- name: Set up Python 3.11
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: '14'
node-version: '20'
cache: 'yarn'

- name: Install packages
Expand All @@ -81,7 +81,7 @@ jobs:
mkdir -p upload/logs
RAILS_ENV=test bundle exec rake db:schema:load
bundle exec rake db:test:prepare
RAILS_ENV=test bundle exec rake webpacker:compile
RAILS_ENV=test bundle exec rake shakapacker:compile
- name: Run tests
run: |
Expand Down
14 changes: 9 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal
# Ignore parallel test databases
db/test.sqlite3-*
db/test_scratch.sqlite3-*
# SQLite files
db/development.sqlite3-shm
db/development.sqlite3-wal

# Ignore all logfiles and tempfiles.
/log/*
Expand Down Expand Up @@ -59,10 +65,6 @@ yarn-debug.log*
# Ignore pickled files
**/*.pkl

# Ignore parallel test databases
db/test.sqlite3-*
db/test_scratch.sqlite3-*

# Ignore configuration
config/configuration.yml
config/database.yml
Expand All @@ -75,4 +77,6 @@ services/whatsopt_server/optimizer_store/oneramdao
app/javascript/XDSMjs

# Ignore Openmdao reports
**/reports
**/reports

# Ignore sqlite files
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.0.3
ruby-3.3.0
4 changes: 2 additions & 2 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<h1>CHANGELOG</h1>

<h3>1.29.0 (15/01/2024)</h3>
<h3>1.30.0 (22/03/2024)</h3>
<ul>
<li>Tech: Upgrade backend and frontend dependencies</li>
<li>Tech: Ruby 3.3, upgrade backend and frontend dependencies</li>
<li>Relax variable name parsing to allow '|', ':' and '.'</li>
</ul>

Expand Down
7 changes: 5 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.0.3"
ruby "3.3.0"

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem "rails", "~> 7.1"
Expand Down Expand Up @@ -132,4 +132,7 @@ gem "deepsort"
gem "sprockets-rails"

# Pagination
gem "pagy", "~> 6.0"
gem "pagy", "~> 7.0"

# Matrix
gem "matrix" # removed from stndard library in ruby 3.1
Loading

0 comments on commit ae0db72

Please sign in to comment.