Skip to content

Revert taplo-cli pin and uprev cargo make 0.35.13.[CPP-726] #619

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 24, 2022
Merged

Revert taplo-cli pin and uprev cargo make 0.35.13.[CPP-726] #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
RUST_CACHE_DIRS: "~/.cargo/registry\n~/.cargo/git\ntarget\n"
LIBCLANG_PATH_WIN: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/Llvm/x64/bin"
CODE_SIGNER_PATH_WIN: "%win10sdk%/x64/signtool.exe"
CARGO_MAKE_VERSION: 0.35.10
CARGO_MAKE_VERSION: 0.35.13
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0"
APP_NAME: swift-console
Expand Down
19 changes: 2 additions & 17 deletions Makefile.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,13 @@ set_env PYTHON_FILES ${py_files}
command = "rustup"
args = ["update", "stable"]

[tasks.taplo-cli-update]
install_crate = { crate_name = "taplo-cli", binary = "taplo", test_arg = [
"--help",
], version = "0.6.0" }

[tasks.cargo-make-deps-update]
dependencies = ["rustup-update", "taplo-cli-update"]
dependencies = ["rustup-update"]
install_crate = { crate_name = "cargo-update", binary = "cargo-install-update", test_arg = [
"-V",
], min_version = "7.0.1" }
command = "cargo"
args = ["install-update", "cargo-make"]
args = ["install-update", "taplo-cli", "cargo-make"]

[tasks.generate-common-constants-rs]
script_runner = "@duckscript"
Expand Down Expand Up @@ -964,16 +959,6 @@ dependencies = ["set-python-files"]
command = "${PYTHON}"
args = ["-m", "pylint", "--output-format=parseable", "@@split(PYTHON_FILES, )"]

[tasks.format-toml]
description = "Formats all toml files defined in the CARGO_MAKE_FORMAT_TOML_FILES environment variable."
category = "Development"
condition = { env_set = ["CARGO_MAKE_FORMAT_TOML_FILES"] }
install_crate = { crate_name = "taplo-cli", binary = "taplo", version = "0.6.0", test_arg = [
"--help",
] }
command = "taplo"
args = ["format", "${CARGO_MAKE_FORMAT_TOML_FILES}"]

[tasks.toml-format-check]
# Note format-toml task is defined by cargo-make to use crate taplo-cli, but the version is
# unspecified. Task cargo-make-deps-update keeps the dev version in sync with CI.
Expand Down
2 changes: 1 addition & 1 deletion installers/macOS/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
<key>CFBundleVersion</key>
<string>@@VERSION@@</string>
</dict>
</plist>
</plist>