Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update rustic_core and other dependencies and fix merge precedence #1282

Merged
merged 7 commits into from
Oct 2, 2024

Conversation

simonsan
Copy link
Contributor

@simonsan simonsan commented Oct 2, 2024

Due to changes in the way how merging of values were applied to configuration values in BackendOptions this should is considered a fix. Now values from the configuration file don't overwrite values from environment variables, any more. As it was intended and stated in the documentation.

Please make sure, your workflow is still working as intended, especially that the configuration values and environment variables are applied as you wanted it and as we documented it in the Configuration documentation.

Precedence also applies when inheriting options from other profiles using use-profiles or when using multiple profiles, e.g. rustic -P one -P two. If the same repository option is defined in one and two the value of one is taken. Before the fix, the value of two was taken. But the fix only applies to the repository options. For other options, one always had precedence.

Fixes #1226

Breaking Change: Due to changes in the way how merging of values is applied to configuration values in BackendOptions this should be considered a breaking change. Please make sure, your workflow is still working as intended, especially that the configuration is applied as you wanted it.

Signed-off-by: simonsan <[email protected]>
@simonsan simonsan added M-breaking Meta: Breaking change C-refactor Category: Refactoring of already existing code A-core Area: Generally related to `rustic_core` A-dependencies Area: Related to updating dependencies M-breaking-docs-todo Meta: Breaking changes documentation todo labels Oct 2, 2024
@simonsan simonsan requested a review from aawsome October 2, 2024 02:07
@simonsan
Copy link
Contributor Author

simonsan commented Oct 2, 2024

Breaking changes documentation here: rustic-rs/docs#92

@aawsome
Copy link
Member

aawsome commented Oct 2, 2024

IMO this is not breaking

@aawsome aawsome disabled auto-merge October 2, 2024 06:51
Copy link
Member

@aawsome aawsome left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but the breaking discussion needs to be closed before merging this ;-)

@simonsan simonsan changed the title chore(deps)!: update rustic_core and other dependencies chore(deps): update rustic_core and other dependencies Oct 2, 2024
@simonsan simonsan changed the title chore(deps): update rustic_core and other dependencies fix(deps): update rustic_core and other dependencies and fix merge precedence Oct 2, 2024
@simonsan simonsan requested a review from aawsome October 2, 2024 13:00
@aawsome aawsome removed M-breaking Meta: Breaking change M-breaking-docs-todo Meta: Breaking changes documentation todo labels Oct 2, 2024
@simonsan simonsan enabled auto-merge October 2, 2024 13:15
Copy link
Member

@aawsome aawsome left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@simonsan simonsan added this pull request to the merge queue Oct 2, 2024
Merged via the queue into main with commit ec6165a Oct 2, 2024
25 checks passed
@simonsan simonsan deleted the update-deps-1 branch October 2, 2024 14:00
This was referenced Oct 2, 2024
simonsan added a commit that referenced this pull request Oct 2, 2024
…ecedence (#1282)

Due to changes in the way how merging of values were applied to
configuration values in `BackendOptions` this should is considered a
fix. Now values from the configuration file don't overwrite values from
environment variables, any more. As it was intended and stated in the
documentation.

Please make sure, your workflow is still working as intended, especially
that the configuration values and environment variables are applied as
you wanted it and as we documented it in the Configuration
documentation.

Precedence also applies when inheriting options from other profiles
using `use-profiles` or when using multiple profiles, e.g. `rustic -P
one -P two`. If the same repository option is defined in `one` and `two`
the value of `one` is taken. Before the fix, the value of `two` was
taken. But the fix only applies to the repository options. For other
options, `one` always had precedence.

Fixes #1226

---------

Signed-off-by: simonsan <[email protected]>
Co-authored-by: Alexander Weiss <[email protected]>
github-merge-queue bot pushed a commit that referenced this pull request Oct 3, 2024
## 🤖 New release
* `rustic-rs`: 0.9.0 -> 0.9.1 (✓ API compatible changes)

<details><summary><i><b>Changelog</b></i></summary><p>

<blockquote>

## [0.9.1](v0.9.0...v0.9.1)
- 2024-10-03

### Added

- *(config)* add more filters
([#1263](#1263))
- *(check)* Allow to only check trees+packs for given snapshots
([#1230](#1230))
- *(commands)* add a `docs` command to easily access the user, dev and
config documentation
([#1276](#1276))

### Fixed

- *(docs/cli)* improve the descriptions of the CLI commands
([#1277](#1277))
- *(deps)* update rustic_core and other dependencies and fix merge
precedence ([#1282](#1282))
- *(docs)* update configuration documentation to align with recent
changes ([#1280](#1280))

### Other

- *(deps)* upgrade dependencies
([#1289](#1289))
- add triage label to new issues only if no label has been set when
creating it ([#1287](#1287))
- *(interactive)* use update methods for refreshing snapshots
([#1285](#1285))
</blockquote>


</p></details>

---
This PR was generated with
[release-plz](https://github.com/MarcoIeni/release-plz/).

Co-authored-by: rustic-release-plz[bot] <182542030+rustic-release-plz[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-core Area: Generally related to `rustic_core` A-dependencies Area: Related to updating dependencies C-refactor Category: Refactoring of already existing code S-waiting-for-review Status: PRs waiting for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

RUSTSEC-2024-0370: proc-macro-error is unmaintained
2 participants