Skip to content

fix: default build creation #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2024
Merged

fix: default build creation #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/bolt-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -41,9 +44,9 @@ jobs:
if: failure()
uses: mxschmitt/action-tmate@v3

- name: K3D Cleanup
- name: Bolt Cleanup
if: always()
run: nix-shell --pure --run "k3d cluster delete rivet-ci"
run: nix-shell --pure --run "bolt infra destroy --yes"

- name: Force Parallel Failure
if: failure()
Expand Down
6 changes: 3 additions & 3 deletions gen/secrets.baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,14 @@
"filename": "infra/nix/bolt/default.nix",
"hashed_secret": "7096ce78355a7fc302686472413e82c32dcd89cc",
"is_verified": false,
"line_number": 55
"line_number": 57
},
{
"type": "Base64 High Entropy String",
"filename": "infra/nix/bolt/default.nix",
"hashed_secret": "80a11fe90031acb43c4de1afdc8fee4bb665d183",
"is_verified": false,
"line_number": 56
"line_number": 58
}
],
"infra/nix/pkgs/clickhouse.nix": [
Expand Down Expand Up @@ -248,5 +248,5 @@
}
]
},
"generated_at": "2024-04-17T19:33:19Z"
"generated_at": "2024-04-18T17:53:47Z"
}
2 changes: 2 additions & 0 deletions infra/nix/bolt/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,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
Expand Down
7 changes: 6 additions & 1 deletion svc/pkg/build/ops/create/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion svc/pkg/build/standalone/default-create/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
},
],
Expand Down