Skip to content

Commit

Permalink
CI Fixes (#1581)
Browse files Browse the repository at this point in the history
* upgrade puma to 6.x

* restrict push workflows to master

* maintain support for Ruby v2 in test environment

* add required workflows

* only test newest/oldest node versions
  • Loading branch information
Judahmeek authored Nov 15, 2023
1 parent 249c698 commit 14f8633
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 19 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/lint-js-and-ruby.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
name: Lint JS and Ruby

on: [push, pull_request]

on:
push:
branches:
- 'master'
pull_request:

jobs:
build:
strategy:
matrix:
ruby: [3]
node: [18]
node: [20]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
name: Main test

on: [push, pull_request]
on:
push:
branches:
- 'master'
pull_request:

jobs:
build-dummy-app-webpack-test-bundles:
strategy:
matrix:
ruby: [2.7, 3.2]
node: [16, 18]
node: [14, 20]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -79,8 +83,8 @@ jobs:
needs: build-dummy-app-webpack-test-bundles
strategy:
matrix:
ruby: [2.7]
node: [14]
ruby: [2.7, 3.2]
node: [14, 20]
rake_task: ['run_rspec:all_but_examples', 'run_rspec:examples']
runs-on: ubuntu-22.04
steps:
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/package-js-tests.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: JS unit tests for Renderer package

on: [push, pull_request]

on:
push:
branches:
- 'master'
pull_request:

jobs:
build:
strategy:
matrix:
node: [16, 18]
node: [14, 20]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/rspec-package-specs.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
name: Rspec test for gem

on: [push, pull_request]
on:
push:
branches:
- 'master'
pull_request:

jobs:
build:
strategy:
matrix:
ruby: [2.7, 3.2]
node: [16, 18]
node: [14, 20]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
Expand Down
5 changes: 3 additions & 2 deletions Gemfile.development_dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gem "sqlite3"
gem "sass-rails", "~> 6.0"
gem "uglifier"
gem "jquery-rails"
gem "puma", "~> 5.0"
gem "puma", "~> 6.0"
gem "bundler", "2.4.17"

# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
Expand Down Expand Up @@ -46,5 +46,6 @@ group :test do
gem "rspec_junit_formatter"
gem "rspec-rails"
gem "rspec-retry"
gem "selenium-webdriver"
gem "selenium-webdriver", "4.9.0"
gem "webdrivers", "5.3.0"
end
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

module ReactOnRails
module ServerRenderingPool
# rubocop:disable Metrics/ClassLength
class RubyEmbeddedJavaScript
# rubocop:disable Metrics/ClassLength
class << self
def reset_pool
options = {
Expand Down
17 changes: 11 additions & 6 deletions spec/dummy/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ GEM
psych (5.1.0)
stringio
public_suffix (5.0.3)
puma (5.6.6)
puma (6.4.0)
nio4r (~> 2.0)
racc (1.7.1)
rack (2.2.8)
Expand Down Expand Up @@ -298,7 +298,7 @@ GEM
sass (~> 3.5, >= 3.5.5)
sdoc (2.6.1)
rdoc (>= 5.0)
selenium-webdriver (4.11.0)
selenium-webdriver (4.9.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -340,6 +340,10 @@ GEM
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (2.4.2)
webdrivers (5.3.0)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (~> 4.0, < 4.11)
websocket (1.2.9)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
Expand Down Expand Up @@ -370,25 +374,26 @@ DEPENDENCIES
pry-doc
pry-rails
pry-rescue
puma (~> 5.0)
puma (~> 6.0)
rails (~> 7.0, >= 7.0.1)
react_on_rails!
rspec-rails
rspec-retry
rspec_junit_formatter
rubocop (~> 1.56)
rubocop-performance
rubocop-rspec
rubocop-performance (~> 1.18.0)
rubocop-rspec (~> 2.23.2)
sass-rails (~> 6.0)
scss_lint
sdoc
selenium-webdriver
selenium-webdriver (= 4.9.0)
shakapacker (= 7.0.1)
spring (~> 4.0)
sprockets (~> 4.0)
sqlite3
turbolinks
uglifier
webdrivers (= 5.3.0)

BUNDLED WITH
2.4.17

0 comments on commit 14f8633

Please sign in to comment.