Skip to content

Commit

Permalink
* Fixed that cranelift would always be used for compilation. (even wh…
Browse files Browse the repository at this point in the history
…en "compileWithCranelift", in tilt, was false)
  • Loading branch information
Venryx committed May 20, 2024
1 parent 8066dd2 commit 9b7e3dd
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Tilt/App.star
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def Start_App(g):
},
)

rustProfile = ("release" if g["compileWithRelease"] else "dev") + ("_clif" if g["compileWithCranelift"] else "")
def CopyFromPath(packageName, usedCranelift = g["compileWithCranelift"], usedRelease = g["compileWithRelease"]):
# we have to hard-code these branches, since rust outputs "dev" profile into the "debug" folder fsr (also simplifies underscore handling)
if usedCranelift:
Expand All @@ -48,7 +49,7 @@ def Start_App(g):
"RUST_BASE_URL": imageURL_rustBase,
"ENVIRONMENT": ENV,
"debug_vs_release": "release" if g["compileWithRelease"] else "debug",
"debug_vs_release_profile": "release_clif" if g["compileWithRelease"] else "dev_clif",
"debug_vs_release_profile": rustProfile,
# docker doesn't seem to support string interpolation in COPY command, so do it here
"copy_from_path": CopyFromPath("monitor-backend"),
},
Expand All @@ -59,7 +60,7 @@ def Start_App(g):
"RUST_BASE_URL": imageURL_rustBase,
"ENVIRONMENT": ENV,
"debug_vs_release": "release" if g["compileWithRelease"] else "debug",
"debug_vs_release_profile": "release_clif" if g["compileWithRelease"] else "dev_clif",
"debug_vs_release_profile": rustProfile,
# docker doesn't seem to support string interpolation in COPY command, so do it here
"copy_from_path": CopyFromPath("web-server"),
},
Expand All @@ -70,7 +71,7 @@ def Start_App(g):
"RUST_BASE_URL": imageURL_rustBase,
"ENVIRONMENT": ENV,
"debug_vs_release": "release" if g["compileWithRelease"] else "debug",
"debug_vs_release_profile": "release_clif" if g["compileWithRelease"] else "dev_clif",
"debug_vs_release_profile": rustProfile,
# docker doesn't seem to support string interpolation in COPY command, so do it here
"copy_from_path": CopyFromPath("app-server"),
},
Expand Down

0 comments on commit 9b7e3dd

Please sign in to comment.