From e19ba4e341c8c38e60893c0d4cdf164237c8518e Mon Sep 17 00:00:00 2001 From: har7an <99636919+har7an@users.noreply.github.com> Date: Fri, 9 Dec 2022 11:06:11 +0000 Subject: [PATCH] Makefile: Fix CI ordering/dependencies (#2004) --- Makefile.toml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.toml b/Makefile.toml index a14cc0e98..bc433cbb7 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -235,6 +235,7 @@ args = ["push", "--atomic", "origin", "main", "v${CARGO_MAKE_CRATE_VERSION}"] [tasks.commit-all] ignore_errors = true +dependencies = ["plugins-release"] command = "git" args = ["commit", "-aem", "chore(release): v${CARGO_MAKE_CRATE_VERSION}"] @@ -244,6 +245,7 @@ args = ["tag", "--annotate", "--message", "Version ${CARGO_MAKE_CRATE_VERSION}", [tasks.publish-zellij-tile] ignore_errors = true +dependencies = ["publish-zellij-utils"] cwd = "zellij-tile" script = "cargo publish && sleep 15" @@ -261,7 +263,7 @@ script = "cargo publish && sleep 15" [tasks.publish-zellij-utils] ignore_errors = true -dependencies = ["publish-zellij-tile"] +dependencies = ["publish-zellij-utils"] cwd = "zellij-utils" script = "cargo publish && sleep 15" @@ -272,9 +274,11 @@ script = "cargo publish && sleep 15" [tasks.publish-zellij] dependencies = [ + "publish-zellij-utils", + "publish-zellij-tile-utils", + "publish-zellij-tile", "publish-zellij-client", "publish-zellij-server", - "publish-zellij-utils", ] command = "cargo" args = ["publish"]