Skip to content

Commit

Permalink
186301166 m1 compatibility v1 (#2573)
Browse files Browse the repository at this point in the history
* initial commit, 9 failures in rspec

* tweak GHA rollback gemfile

* bump nokogiri, cleanup gemfile

* try 3

* change how we pull the code

* I lost hope

* downgrade ubuntu

* initial nokogiri version

* trying to push native nokogiri

* trying to workaround timeout

* rollback to working config

* removed extra checkout, is the version an issue ?

* trying to figure it out whats going on with some debug messages

* ups

* is a thread issue?

* download xml fixed, nothing like deprecating your own work

* rolling back rubocop un-needed change

* rubocop and cleanup

* more rubocop

* fixes platform issues for x86_64

* update ruby version to 2.7.6

* fix transport_gateway

---------

Co-authored-by: Marco (Polo) Ornelas <marco.ornelas@ideacrew.com>
Co-authored-by: Marco (Polo) Ornelas <me@poloornelas.mx>
Co-authored-by: rahul <rahul.gudimetla@ideacrew.com>
  • Loading branch information
4 people authored Feb 23, 2024
1 parent ba37b07 commit ff681d5
Show file tree
Hide file tree
Showing 13 changed files with 513 additions and 272 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,12 @@ jobs:
fi
needs_chromedriver: true
steps:
- name: Set up Ruby 2.6.5
- uses: actions/checkout@v3
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6.5
rubygems: 3.3.26
bundler-cache: true
- name: Setup Node.js for use with actions
uses: actions/setup-node@v1
if: matrix.command_configs.skip_js != 'true'
Expand All @@ -185,7 +187,6 @@ jobs:
if: matrix.command_configs.skip_js != 'true'
with:
mongoDBVersion: ${{ matrix.mongodb-version }}
- uses: actions/checkout@v2
- name: Set up Chromedriver
if: matrix.command_configs.needs_chromedriver
uses: nanasess/setup-chromedriver@master
Expand All @@ -207,7 +208,7 @@ jobs:
${{ runner.os }}-node_modules-${{ hashFiles('yarn.lock') }}
- name: bundle install
run: |
gem install bundler -v '1.17.3'
gem install bundler -v '1.17.3'
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3
gem install treye-semaphore_test_boosters --version '2.5.1'
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.5
2.7.6
31 changes: 21 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.5'
ruby '2.7.6'

gem "benefit_markets", path: "components/benefit_markets"
gem "benefit_sponsors", path: "components/benefit_sponsors"
Expand All @@ -21,23 +21,19 @@ gem 'chosen-rails'
gem 'ckeditor'
gem 'coffee-rails', '~> 4.1.0'
gem 'combine_pdf'
gem 'config', '~> 1.0.0'
gem 'curl'
gem 'devise', '~> 4.5'
gem 'effective_datatables', path: './project_gems/effective_datatables-2.6.14'
gem 'haml'
gem 'httparty'
gem 'i18n', '0.7.0'
gem 'interactor', '3.1.0'
gem 'interactor-rails', '2.0.2'
gem 'jbuilder', '~> 2.0'
gem 'jquery-datatables-rails', '3.4.0'
gem 'jquery-rails', '4.0.5'
gem 'jquery-turbolinks'
gem 'jquery-ui-rails'
gem 'kaminari', '0.17.0'
gem 'language_list', '~> 1.1.0'
gem 'less-rails-bootstrap', '~> 3.3.1.0'
gem 'mail', '2.6.3'
gem 'maskedinput-rails'
gem 'money-rails', '~> 1.10.0'
Expand All @@ -50,8 +46,7 @@ gem 'mongoid-history'
gem 'mongoid-versioning'
gem 'mongoid_rails_migrations', git: 'https://github.com/adacosta/mongoid_rails_migrations.git', branch: 'master'
gem 'mongoid_userstamp'
gem 'nokogiri', '1.9.1'
gem 'nokogiri-happymapper', :require => 'happymapper'

gem 'non-stupid-digest-assets', '~> 1.0', '>= 1.0.9'
gem "notifier", path: "components/notifier"
gem 'openhbx_cv2', git: 'https://github.com/ideacrew/openhbx_cv2.git', branch: 'trunk'
Expand All @@ -67,14 +62,12 @@ gem 'redis-rails'
gem 'resque'
gem 'roo', '~> 2.1.0'
gem 'ruby-saml', '~> 1.3.0'
gem 'sass-rails', '~> 5.0'
gem 'slim', '~> 3.0.8'
gem 'slim-rails'
gem 'simple_calendar', :git => 'https://github.com/harshared/simple_calendar'
gem "sponsored_benefits", path: "components/sponsored_benefits"
gem 'sprockets', '~> 2.12.3'
gem 'symmetric-encryption', '~> 3.6.0'
gem 'therubyracer', platforms: :ruby
gem "transport_gateway", path: "components/transport_gateway"
gem "transport_profiles", path: "components/transport_profiles"
gem 'turbolinks', '2.5.3'
Expand All @@ -86,6 +79,24 @@ gem 'webpacker'
gem 'rubyXL'
gem 'holidays', '~> 8.6'

#arm64 mac support
gem 'ffi', '1.14.0'
gem 'kostya-sigar', '2.0.10'
gem 'mini_racer', '0.6.4'
gem 'bigdecimal', '1.3.5'
gem 'loofah', '~>2.19.1'
gem 'dry-container', '~> 0.7.2'
gem 'haml-rails', '~> 1.0'
gem 'sassc', '~> 2.0'
gem 'sass-rails', '~> 5'
gem 'config', '~> 2.0'

gem 'interactor', '~> 3.1'
gem 'interactor-rails', '~> 2.2'

gem 'nokogiri', '~> 1.11'
gem 'nokogiri-happymapper', :require => 'happymapper'

#######################################################
# Removed gems
#######################################################
Expand Down Expand Up @@ -136,7 +147,7 @@ end

group :test do
gem 'action_mailer_cache_delivery', '~> 0.3.7'
gem 'capybara'
gem 'capybara', '3.32.1'
gem 'capybara-screenshot'
gem 'cucumber', '3.1.2'
gem 'cucumber-rails', '1.6.0', :require => false
Expand Down
Loading

0 comments on commit ff681d5

Please sign in to comment.