IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: support systems without SSE 4.2 (#17505)

Browse Source 
Older CPUs do not support the instruction set used internally by the oj gem
starting with version 3.13.15.

This pins the version to a working one while oj patch the project to support
CPUs without the instructions (eg: AMD Opteron 4180).

see:

https://meta.discourse.org/t/discourse-update-keeps-failing/231862
https://github.com/ohler55/oj/issues/789
a455c389c0
This commit is contained in:
Sam 2022-07-15 10:06:04 +10:00 committed by GitHub
parent 7d9b98a161
commit 8dad778fcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -105,7 +105,8 @@ gem 'omniauth-oauth2', require: false
gem 'omniauth-google-oauth2' gem 'omniauth-google-oauth2'
gem 'oj' # pending: https://github.com/ohler55/oj/issues/789
gem 'oj', '3.13.14'
gem 'pg' gem 'pg'
gem 'mini_sql' gem 'mini_sql'

6
Gemfile.lock
View File

@ -283,7 +283,7 @@ GEM
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
oj (3.13.16) oj (3.13.14)
omniauth (1.9.1) omniauth (1.9.1)
hashie (>= 3.4.6) hashie (>= 3.4.6)
rack (>= 1.6.2, < 3) rack (>= 1.6.2, < 3)
@ -579,7 +579,7 @@ DEPENDENCIES
mustache mustache
net-http net-http
nokogiri nokogiri
oj oj (= 3.13.14)
omniauth omniauth
omniauth-facebook omniauth-facebook
omniauth-github omniauth-github
@ -638,4 +638,4 @@ DEPENDENCIES
yaml-lint yaml-lint
BUNDLED WITH BUNDLED WITH
2.3.16 2.3.18