revert: fix(mac): should normalize unicode strings from file system before used in string compare #7905
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit 37a17f2 (#4841).
Since names are normalized to NFD as of #7901, normalizing them back to NFC leads to a similar error:
The error ony occurs in:
Darwin Mac-1701234016364.local 21.6.0 Darwin Kernel Version 21.6.0: Wed Oct 4 23:55:28 PDT 2023; root:xnu-8020.240.18.704.15~1/RELEASE_X86_64 x86_64
(GitHub Actionsmacos-latest
, https://github.com/jebibot/electron-test/actions/runs/7028916259/job/19125658541)Darwin Mac-1701233428287.local 22.6.0 Darwin Kernel Version 22.6.0: Fri Sep 15 13:39:52 PDT 2023; root:xnu-8796.141.3.700.8~1/RELEASE_X86_64 x86_64
(GitHub Actionsmacos-13
, https://github.com/jebibot/electron-test/actions/runs/7028916259/job/19125658708)but not in:
Darwin MacBookPro.local 23.1.0 Darwin Kernel Version 23.1.0: Mon Oct 9 21:27:24 PDT 2023; root:xnu-10002.41.9~6/RELEASE_ARM64_T6000 arm64
It seems like a macOS < 14 issue or an x64 vs. arm64 issue so I couldn't catch it earlier. Sorry, I should've tested more.
This fix was also mentioned in #5977:
Tested on: https://github.com/jebibot/electron-test/actions/runs/7028981048.