Skip to content

Commit ccfc0af

Browse files
author
Jason Mobarak
authored
ci: bump cargo-make to 0.35.10, pin taplo-cli at 0.6.0 (#525)
Follow-up Jira: https://swift-nav.atlassian.net/browse/CPP-726
1 parent 37d7023 commit ccfc0af

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
RUST_CACHE_DIRS: "~/.cargo/registry\n~/.cargo/git\ntarget\n"
1515
LIBCLANG_PATH_WIN: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/Llvm/x64/bin"
1616
CODE_SIGNER_PATH_WIN: "%win10sdk%/x64/signtool.exe"
17-
CARGO_MAKE_VERSION: 0.35.0
17+
CARGO_MAKE_VERSION: 0.35.10
1818
CARGO_INCREMENTAL: 0
1919
RUSTFLAGS: "-C debuginfo=0"
2020
APP_NAME: swift-console

Makefile.toml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,18 @@ set_env PYTHON_FILES ${py_files}
9090
command = "rustup"
9191
args = ["update", "stable"]
9292

93+
[tasks.taplo-cli-update]
94+
install_crate = { crate_name = "taplo-cli", binary = "taplo", test_arg = [
95+
"--help",
96+
], version = "0.6.0" }
97+
9398
[tasks.cargo-make-deps-update]
94-
dependencies = ["rustup-update"]
99+
dependencies = ["rustup-update", "taplo-cli-update"]
95100
install_crate = { crate_name = "cargo-update", binary = "cargo-install-update", test_arg = [
96101
"-V",
97102
], min_version = "7.0.1" }
98103
command = "cargo"
99-
args = ["install-update", "taplo-cli", "cargo-make"]
104+
args = ["install-update", "cargo-make"]
100105

101106
[tasks.generate-common-constants-rs]
102107
script_runner = "@duckscript"
@@ -822,6 +827,16 @@ dependencies = ["set-python-files"]
822827
command = "${PYTHON}"
823828
args = ["-m", "pylint", "--output-format=parseable", "@@split(PYTHON_FILES, )"]
824829

830+
[tasks.format-toml]
831+
description = "Formats all toml files defined in the CARGO_MAKE_FORMAT_TOML_FILES environment variable."
832+
category = "Development"
833+
condition = { env_set = ["CARGO_MAKE_FORMAT_TOML_FILES"] }
834+
install_crate = { crate_name = "taplo-cli", binary = "taplo", version = "0.6.0", test_arg = [
835+
"--help",
836+
] }
837+
command = "taplo"
838+
args = ["format", "${CARGO_MAKE_FORMAT_TOML_FILES}"]
839+
825840
[tasks.toml-format-check]
826841
# Note format-toml task is defined by cargo-make to use crate taplo-cli, but the version is
827842
# unspecified. Task cargo-make-deps-update keeps the dev version in sync with CI.

0 commit comments

Comments
 (0)