Fix calculation of Settings hash related to Cache commands #1869
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SettingsContentHasher used to receive SettingsDictionary and generate a string based on the keys and values. However, it wasn’t sorted according to the keys, so every run could yield a different hash for the settings. I also changed the implementation of `hash(_ settingsDictionary: SettingsDictionary) ` to match the naming, and return the hash of the settings (and not simply a string containing its contents).
In SynthesizedResourceInterfaceProjectMapper.swift
andreacipriani
approved these changes
Oct 6, 2020
| @@ -16,7 +16,7 @@ public final class DependenciesContentHasher: DependenciesContentHashing { | |||
| self.contentHasher = contentHasher | |||
| } | |||
|
|
|||
| // MARK: - HeadersContentHashing | |||
| // MARK: - DependenciesContentHashing | |||
There was a problem hiding this comment.
copy/paste traces.... :)
There was a problem hiding this comment.
I imagined 😃 There was another one as well.
natanrolnik
force-pushed
the
cache-fix-settings-hash
branch
from
ed2029b
to
e4535f5
Compare
pepicrft
approved these changes
Oct 8, 2020
|
@all-contributors add @natanrolnik for bug |
|
@pepibumur I've put up a pull request to add @natanrolnik! 🎉 |
|
@natanrolnik I think you'll have to update the associated to include the right hash. |
bhuemer
pushed a commit
to bhuemer/tuist
that referenced
this pull request
Oct 12, 2020
* Fix hashing calculation of SettingsDictionary SettingsContentHasher used to receive SettingsDictionary and generate a string based on the keys and values. However, it wasn’t sorted according to the keys, so every run could yield a different hash for the settings. I also changed the implementation of `hash(_ settingsDictionary: SettingsDictionary) ` to match the naming, and return the hash of the settings (and not simply a string containing its contents). * Fix a typo in a warning message In SynthesizedResourceInterfaceProjectMapper.swift * Update Changelog * Update tests * Fix another test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Short description 📝
In our projects, every time
tuist cache print-hashesran, it would result in different hashes.Solution 📦
When debugging Tuist, I noticed that the hash generated by
SettingsContentHasherwas different between runs.After investigating it a little bit, I found that
SettingsContentHasherused to receive SettingsDictionary and generate a string based on the keys and values. However, it wasn’t sorted according to the keys, so every run could yield a different hash for the settings.I also changed the implementation of
hash(_ settingsDictionary: SettingsDictionary)to match its naming, and return the hash of the settings instead of simply a string containing its contents.