Skip to content

Commit

Permalink
fix: local model management version was not built properly by the CI …
Browse files Browse the repository at this point in the history
…& prepare 0.6.1 release
  • Loading branch information
JoFrost committed Mar 30, 2023
1 parent 0dbdc89 commit dd9afff
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,11 @@ jobs:
pushd outdir
mv blindai_mock_server-x86_64-unknown-linux-gnu.tgz "blindai_mock_server-$VERSION_TAG-x86_64-unknown-linux-gnu.tgz"
popd
mv outdir-local/manifest.toml outdir-local/manifest_cloud.toml
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} gh release create --verify-tag v$VERSION_TAG \
outdir/manifest.toml \
outdir-local/manifest_cloud.toml \
"outdir/blindai_server-$VERSION_TAG.tgz" \
"outdir/blindai_mock_server-$VERSION_TAG-x86_64-unknown-linux-gnu.tgz"
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "blindai_server"
version = "0.6.0"
version = "0.6.1"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down Expand Up @@ -59,7 +59,7 @@ heap-size=0x4FBA00000
# the current system.
# Gotcha: Don't forget to count the main thread when counting number of
# threads.
threads=20
threads=32
# SSA frame size (in pages) for each thread, the default SSA frame size is 1.
# You normally don't need to change the SSA frame size.
ssaframesize=1
Expand Down
2 changes: 2 additions & 0 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ build-release-enclave-local-management:
COPY rust-toolchain.toml Cargo.toml Cargo.lock manifest.prod.template.toml ./
COPY .cargo .cargo
COPY src src
COPY build.rs build.rs
COPY tar-rs-sgx tar-rs-sgx
COPY tract tract
COPY ring-fortanix ring-fortanix
Expand Down Expand Up @@ -380,6 +381,7 @@ build-release-enclave-local-management2:
COPY rust-toolchain.toml Cargo.toml Cargo.lock manifest.prod.template.toml ./
COPY .cargo .cargo
COPY src src
COPY build.rs build.rs
COPY tar-rs-sgx tar-rs-sgx
COPY tract tract
COPY ring-fortanix ring-fortanix
Expand Down
2 changes: 1 addition & 1 deletion client/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "blindai"
version = "0.6.0"
version = "0.6.1"
description = ""
authors = ["Mithril Security <[email protected]>"]
readme = "README.md"
Expand Down
3 changes: 1 addition & 2 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ run-local-management *args:
#!/usr/bin/env bash
set -e
export DISALLOW_REMOTE_UPLOAD=1
cargo build --target x86_64-fortanix-unknown-sgx {{args}}
DISALLOW_REMOTE_UPLOAD="true" cargo build --target x86_64-fortanix-unknown-sgx {{args}}

binpath=`cargo build --target x86_64-fortanix-unknown-sgx {{args}} --message-format json 2>/dev/null \
| jq -r 'select(.reason=="compiler-artifact" and .target.kind==["bin"]) | .executable'`
Expand Down
4 changes: 3 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ fn get_collateral(quote: &[u8]) -> Result<SgxCollateral> {
}

fn main() -> Result<()> {
println!("BlindAI server is running on the ports 9923 and 9924");
println!("Starting BlindAI server...");

// Setup TELEMETRY
let telemetry_disabled = TELEMETRY_CHANNEL.is_disabled();
Expand Down Expand Up @@ -293,6 +293,8 @@ fn main() -> Result<()> {
}
});

println!("BlindAI server is running on the ports 9923 and 9924");

// Emit the telemetry `Started` event
telemetry::add_event(telemetry::TelemetryEventProps::Started {}, None, None);
_unattested_handle.join().unwrap();
Expand Down

0 comments on commit dd9afff

Please sign in to comment.