Skip to content

Commit

Permalink
ci: bump cargo-make to 0.35.10, pin taplo-cli at 0.6.0 (#525)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason Mobarak committed Apr 20, 2022
1 parent 37d7023 commit ccfc0af
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
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.0
CARGO_MAKE_VERSION: 0.35.10
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0"
APP_NAME: swift-console
Expand Down
19 changes: 17 additions & 2 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,18 @@ 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"]
dependencies = ["rustup-update", "taplo-cli-update"]
install_crate = { crate_name = "cargo-update", binary = "cargo-install-update", test_arg = [
"-V",
], min_version = "7.0.1" }
command = "cargo"
args = ["install-update", "taplo-cli", "cargo-make"]
args = ["install-update", "cargo-make"]

[tasks.generate-common-constants-rs]
script_runner = "@duckscript"
Expand Down Expand Up @@ -822,6 +827,16 @@ 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

0 comments on commit ccfc0af

Please sign in to comment.