diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 219055427..36a7dd8ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: - ubuntu-latest arch: - x64 + - x86 steps: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@v1 diff --git a/NEWS.md b/NEWS.md index a310f4a20..b02ac62cc 100644 --- a/NEWS.md +++ b/NEWS.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Bug-fix for 32-bit Julia: Replace all occurences of Int64 by Int. Since PR [#445](https://github.com/gridap/Gridap.jl/pull/445). + - Bug-fix for 32-bit Julia. Using inttype=Int keyword argument for JSON parsing. Since PR [#456](https://github.com/gridap/Gridap.jl/pull/456). ## [0.14.1] - 2020-09-17 diff --git a/src/Io/Json.jl b/src/Io/Json.jl index 1c199ae8b..0831f95f7 100644 --- a/src/Io/Json.jl +++ b/src/Io/Json.jl @@ -3,7 +3,7 @@ from_json(::Type{T},s::AbstractString) where T """ function from_json(::Type{T},s::AbstractString) where T - json_dict = JSON.parse(s) + json_dict = JSON.parse(s;inttype=Int) dict = _decode_json_dict(json_dict) from_dict(T,dict) end @@ -12,7 +12,7 @@ end from_json_file(::Type{T},s::AbstractString) where T """ function from_json_file(::Type{T},s::AbstractString) where T - json_dict = JSON.parsefile(s) + json_dict = JSON.parsefile(s;inttype=Int) dict = _decode_json_dict(json_dict) from_dict(T,dict) end