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

Added ability to include directories as an extension of the config file #421

Merged
merged 20 commits into from
May 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2e0e9ba
Add the ability to have the config file in $XDG_CONFIG_HOME/topgrade/…
PolpOnline May 3, 2023
3842ab6
Added ability to include directories as an extension of the config file
PolpOnline May 4, 2023
e8a77e2
Removed useless dependency "serde_json"
PolpOnline May 4, 2023
a02cdd2
Merge branch 'topgrade-rs:master' into master
PolpOnline May 4, 2023
7f2a57c
fmt
PolpOnline May 4, 2023
a3c7b64
Merge remote-tracking branch 'origin/master'
PolpOnline May 4, 2023
e895bbb
Implemented merge strategy for the Commands type
PolpOnline May 5, 2023
aaf71f7
Merge branch 'master' into master
PolpOnline May 5, 2023
5b387b5
Do not stop loading included files if these are invalid/can't be load…
PolpOnline May 5, 2023
daae5d9
Merge branch 'master' into master
PolpOnline May 16, 2023
84ab841
Process includes in the order they are declared. Move all global scop…
PolpOnline May 24, 2023
8753736
remove unused import
PolpOnline May 24, 2023
afe9e9b
Auto-migrate configs without [misc]
PolpOnline May 24, 2023
ab6987a
Merge branch 'master' into master
PolpOnline May 24, 2023
07d3919
Update config.example.toml to reflect changes made to the code
PolpOnline May 24, 2023
ef33500
Merge remote-tracking branch 'origin/master'
PolpOnline May 24, 2023
33d1fc6
Read all files in $CONFIG_DIR/topgrade/topgrade.d/ as part of the con…
PolpOnline May 24, 2023
b514dfd
Merge branch 'master' into master
s34m May 25, 2023
2c45801
Refactor PR code, fmt
PolpOnline May 25, 2023
c232541
Merge branch 'master' into master
PolpOnline May 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 35 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,14 @@ tempfile = "~3.2"
cfg-if = "~1.0"
tokio = { version = "~1.18", features = ["process", "rt-multi-thread"] }
futures = "~0.3"
regex = "~1.5"
regex = "~1.7"
semver = "~1.0"
shell-words = "~1.1"
color-eyre = "~0.6"
tracing = { version = "~0.1", features = ["attributes", "log"] }
tracing-subscriber = { version = "~0.3", features = ["env-filter", "time"] }
merge = "0.1.0"
regex-split = "0.1.0"

[target.'cfg(target_os = "macos")'.dependencies]
notify-rust = "~4.5"
Expand Down
7 changes: 7 additions & 0 deletions config.example.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# Include any additional configuration file(s)
# [include] sections are processed in the order you write them
# Files in $CONFIG_DIR/topgrade/topgrade.d/ are automatically included at the beginning of this file
[include]
#paths = ["/etc/topgrade.toml"]

[misc]
# Don't ask for confirmations
#assume_yes = true

Expand Down