Skip to content

Commit 1f13924

Browse files
Revert taplo-cli pin and uprev cargo make 0.35.13.
1 parent 37d4f01 commit 1f13924

File tree

3 files changed

+4
-19
lines changed

3 files changed

+4
-19
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.10
17+
CARGO_MAKE_VERSION: 0.35.13
1818
CARGO_INCREMENTAL: 0
1919
RUSTFLAGS: "-C debuginfo=0"
2020
APP_NAME: swift-console

Makefile.toml

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

94-
[tasks.taplo-cli-update]
95-
install_crate = { crate_name = "taplo-cli", binary = "taplo", test_arg = [
96-
"--help",
97-
], version = "0.6.0" }
98-
9994
[tasks.cargo-make-deps-update]
100-
dependencies = ["rustup-update", "taplo-cli-update"]
95+
dependencies = ["rustup-update"]
10196
install_crate = { crate_name = "cargo-update", binary = "cargo-install-update", test_arg = [
10297
"-V",
10398
], min_version = "7.0.1" }
10499
command = "cargo"
105-
args = ["install-update", "cargo-make"]
100+
args = ["install-update", "taplo-cli", "cargo-make"]
106101

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

967-
[tasks.format-toml]
968-
description = "Formats all toml files defined in the CARGO_MAKE_FORMAT_TOML_FILES environment variable."
969-
category = "Development"
970-
condition = { env_set = ["CARGO_MAKE_FORMAT_TOML_FILES"] }
971-
install_crate = { crate_name = "taplo-cli", binary = "taplo", version = "0.6.0", test_arg = [
972-
"--help",
973-
] }
974-
command = "taplo"
975-
args = ["format", "${CARGO_MAKE_FORMAT_TOML_FILES}"]
976-
977962
[tasks.toml-format-check]
978963
# Note format-toml task is defined by cargo-make to use crate taplo-cli, but the version is
979964
# unspecified. Task cargo-make-deps-update keeps the dev version in sync with CI.

installers/macOS/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@
3232
<key>CFBundleVersion</key>
3333
<string>@@VERSION@@</string>
3434
</dict>
35-
</plist>
35+
</plist>

0 commit comments

Comments
 (0)