Remove compilation workarounds on XCode 14
What does this merge request do and why?
Since the related upstream fixes have been merged and deployed to the GitLab codebase
- https://github.com/pganalyze/pg_query/pull/256 and gitlab!98274 (merged)
- https://github.com/meinac/oj-introspect/pull/3 and gitlab!103647 (merged)
We can safely remove these workarounds.
How to test this change locally
- We need to run XCode 14 to effectively test this change
$ clang --version Apple clang version 14.0.0 (clang-1400.0.29.202) Target: arm64-apple-darwin22.1.0 Thread model: posix InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
- Remove the following entries in the bundle config in
/gitlab
folder (e.g.gitlab/.bundle/config
)--- BUNDLE_SET: "without production" BUNDLE_JOBS: "10" BUNDLE_BUILD__PG: "--with-pg-config=/Users/tanle/.asdf/installs/postgres/12.13/bin/pg_config" BUNDLE_BUILD__GPGME: "--use-system-libraries" BUNDLE_BUILD__RE2: "--with-re2-dir=/opt/homebrew/opt/re2" BUNDLE_BUILD__THRIFT: "--with-cppflags=-Wno-error=compound-token-split-by-macro" - BUNDLE_BUILD__PG_QUERY: "--with-ldflags=-Wl,-undefined,dynamic_lookup" BUNDLE_BUILD__FFI___YAJL: "--with-ldflags=-Wl,-undefined,dynamic_lookup" - BUNDLE_BUILD__OJ___INTROSPECT: "--with-ldflags=-Wl,-undefined,dynamic_lookup"
- Uninstall
pg-query
andob-introspect
gem uninstall pg-query ob-introspect
- Re-install
pg-query
andob-introspect
withoutldflags
bundle install
Impacted categories
The following categories relate to this merge request:
-
gdk-reliability - e.g. When a GDK action fails to complete. -
gdk-usability - e.g. Improvements or suggestions around how the GDK functions. -
gdk-performance - e.g. When a GDK action is slow or times out.
Merge request checklist
-
This change is backward compatible. If not, please include steps to communicate to our users. -
Tests added for new functionality. If not, please raise an issue to follow-up. -
Documentation added/updated, if needed. -
gdk doctor
test added, if needed. -
Add the ~highlight
label if this MR should be included in theCHANGELOG.md
.
Edited by Tan Le