From b5488f15820ce3ee53e8abe5cf0956ba895f163e Mon Sep 17 00:00:00 2001
From: MasterPtato <maxpopkov.contact@gmail.com>
Date: Fri, 22 Mar 2024 17:41:04 +0000
Subject: [PATCH] fix: default build creation

---
 .github/workflows/bolt-test.yaml                   | 7 +++----
 infra/nix/bolt/default.nix                         | 2 ++
 svc/pkg/build/ops/create/src/lib.rs                | 7 ++++++-
 svc/pkg/build/standalone/default-create/src/lib.rs | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/bolt-test.yaml b/.github/workflows/bolt-test.yaml
index f5b5d14c5a..e1ba528451 100644
--- a/.github/workflows/bolt-test.yaml
+++ b/.github/workflows/bolt-test.yaml
@@ -26,6 +26,9 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           submodules: recursive
 
+      - name: LFS
+        run: git lfs pull
+
       - uses: ./.github/actions/pre-init
         with:
           SCCACHE_AWS_SECRET_ACCESS_KEY: ${{ secrets.SCCACHE_AWS_SECRET_ACCESS_KEY }}
@@ -37,10 +40,6 @@ jobs:
       - name: Bolt Test
         run: nix-shell --pure --run "bolt test"
 
-      - name: Tmate
-        if: failure()
-        uses: mxschmitt/action-tmate@v3
-
       - name: K3D Cleanup
         if: always()
         run: nix-shell --pure --run "k3d cluster delete rivet-ci"
diff --git a/infra/nix/bolt/default.nix b/infra/nix/bolt/default.nix
index 8cae8ce472..6aa1e5c6f7 100644
--- a/infra/nix/bolt/default.nix
+++ b/infra/nix/bolt/default.nix
@@ -42,8 +42,10 @@ rustPlatform.buildRustPackage rec {
 	nativeBuildInputs = buildInputs;
 	doCheck = false;
 
+
 	shellHook = ''
 		export LD_LIBRARY_PATH="${pkgs.lib.strings.makeLibraryPath [ pkgs.openssl ]}"
+		export RUSTFLAGS="--cfg tokio_unstable"
 	'';
 
 	# See https://artemis.sh/2023/07/08/nix-rust-project-with-git-dependencies.html
diff --git a/svc/pkg/build/ops/create/src/lib.rs b/svc/pkg/build/ops/create/src/lib.rs
index 48f1580fb5..958ee042fe 100644
--- a/svc/pkg/build/ops/create/src/lib.rs
+++ b/svc/pkg/build/ops/create/src/lib.rs
@@ -26,13 +26,18 @@ async fn handle(
 
 	let (image_tag, upload_id, image_presigned_requests) =
 		if let Some(build_kind) = &ctx.default_build_kind {
-			let (image_tag, upload_id) = sql_fetch_one!(
+			let default_build_row = sql_fetch_optional!(
 				[ctx, (String, Uuid)]
 				"SELECT image_tag, upload_id FROM db_build.default_builds WHERE kind = $1",
 				build_kind,
 			)
 			.await?;
 
+			let (image_tag, upload_id) = unwrap!(
+				default_build_row,
+				format!("default build missing: {build_kind}")
+			);
+
 			(image_tag, upload_id, Vec::new())
 		} else {
 			let image_file = unwrap_ref!(ctx.image_file);
diff --git a/svc/pkg/build/standalone/default-create/src/lib.rs b/svc/pkg/build/standalone/default-create/src/lib.rs
index 350d388e71..907009d7b3 100644
--- a/svc/pkg/build/standalone/default-create/src/lib.rs
+++ b/svc/pkg/build/standalone/default-create/src/lib.rs
@@ -136,7 +136,7 @@ async fn upload_build(
 			backend::upload::PrepareFile {
 				path: "image.tar".into(),
 				content_length: build.tar.len() as u64,
-				multipart: true,
+				multipart: false,
 				..Default::default()
 			},
 		],