aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuwn <[email protected]>2021-05-17 14:54:52 -0700
committerFuwn <[email protected]>2021-05-17 14:54:52 -0700
commitf022f41515fae768388f9333491c6fdecfc1d2bd (patch)
tree8771a1f03013d7897cfa5150ae8c5c57fa1499f7
parentfix: compile failing on unix (diff)
downloadwhirl-f022f41515fae768388f9333491c6fdecfc1d2bd.tar.xz
whirl-f022f41515fae768388f9333491c6fdecfc1d2bd.zip
fix(make): don't run certain tasks on workspaces
Previosuly, some tasks such as `run` or `docker-build` would run within all workspaces, this would cause errors as not all workspaces have binaries and when binary specific things are performed on the workspaces such as `cargo run`, the entire task would bail. This change just causes those binary dependent tasks to be run on all workspaces as a whole.
-rw-r--r--Makefile.toml12
1 files changed, 12 insertions, 0 deletions
diff --git a/Makefile.toml b/Makefile.toml
index 94cddc5..0c24449 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -42,24 +42,29 @@ dependencies = ["fmt", "check"]
dependencies = ["fmt", "check", "clippy"]
[tasks.help]
+workspace = false
dependencies = ["checkf"]
command = "cargo"
args = ["run", "--", "help"]
[tasks.run]
+workspace = false
dependencies = ["checkf"]
command = "cargo"
args = ["run", "--", "run"]
# This task also depends on your system configuration, same goes as read above.
[tasks.start-client]
+workspace = false
command = "gsudo"
args = ["${WORLDS_PATH}"]
[tasks.runc]
+workspace = false
dependencies = ["start-client", "run"]
[tasks.runw]
+workspace = false
env = { "DISABLE_PROMPT" = true }
dependencies = ["checkf"]
command = "cargo"
@@ -67,16 +72,19 @@ args = ["run", "--", "run"]
watch = true
[tasks.docker-build]
+workspace = false
command = "nix-build"
args = ["docker.nix"]
[tasks.docker-load]
+workspace = false
script_runner = "@shell"
script = '''
docker load < result
'''
[tasks.docker-run]
+workspace = false
command = "docker"
args = [
"run",
@@ -87,6 +95,7 @@ args = [
]
[tasks.docker-run-i]
+workspace = false
command = "docker"
args = [
"run",
@@ -100,9 +109,11 @@ args = [
# Build 'n' load
[tasks.bnl]
+workspace = false
dependencies = ["docker-build", "docker-load"]
[tasks.ask-discord-token]
+workspace = false
script = '''
#!@duckscript
@@ -114,6 +125,7 @@ set_env GITHUB_TOKEN ${github_token}
'''
[tasks.act]
+workspace = false
dependencies = ["ask-discord-token"]
command = "act"
args = ["-s", "GITHUB_TOKEN=${GITHUB_TOKEN}"]