Fixes https://github.com/openstreetmap/openstreetmap-website/issues/6287 ### Context Currently the test suite fails when run with Docker on Apple post-Intel machines (aka Apple silicon, AArch64, ARM64). The issue is with the gem `gd2-ffij`, which hard-codes possible locations for its underlying C library. Unfortunately it doesn't allow for the path that this library uses in an AArch64 machine, and doesn't offer a configuration option that would serve our use case. ### Description This PR implements a proposal by @firefishy (https://github.com/openstreetmap/openstreetmap-website/issues/6287#issuecomment-3156583006): it changes the gem dependency to use a fork that implements the required change. Since it's bound to the specific SHA of the commit, it should be safe to use.
This fix is based on an outstanding PR for the `gd2-ffij` repository, awaiting since last June. Given the low level of activity in [the `gd2-ffij` repo](https://github.com/dark-panda/gd2-ffij) (last commit September 2021), it's unlikely that it will be merged. ### How has this been tested? I have tested this on my MacBook M1 Pro machine. ### Caveat If the forked repo or the relevant commit are removed from GitHub, that will break our builds. A fix for this would be for OSM to host this fork instead. Thoughts? You can view, comment on, or merge this pull request online at: https://github.com/openstreetmap/openstreetmap-website/pull/6408 -- Commit Summary -- * Use fork that introduces support for Docker on Apple silicon -- File Changes -- M Gemfile (3) M Gemfile.lock (12) -- Patch Links -- https://github.com/openstreetmap/openstreetmap-website/pull/6408.patch https://github.com/openstreetmap/openstreetmap-website/pull/6408.diff -- Reply to this email directly or view it on GitHub: https://github.com/openstreetmap/openstreetmap-website/pull/6408 You are receiving this because you are subscribed to this thread. Message ID: <openstreetmap/openstreetmap-website/pull/[email protected]>
_______________________________________________ rails-dev mailing list [email protected] https://lists.openstreetmap.org/listinfo/rails-dev
