Skip to content

Commit

Permalink
Merge pull request #178 from nomic-io/testnet-5.1.2
Browse files Browse the repository at this point in the history
Testnet 5.1.2
  • Loading branch information
mappum authored Jul 31, 2023
2 parents affdc7d + 05e8c52 commit 18b1187
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nomic"
version = "5.1.1"
version = "5.1.2"
authors = [ "The Nomic Team <hello@nomic.io>" ]
edition = "2021"
default-run = "nomic"
Expand Down
5 changes: 5 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,16 @@ fn main() {

let shell = std::env::var("SHELL").unwrap_or("/bin/bash".to_string());
println!("Using shell: {}", shell);

let cargo_features =
std::env::var("NOMIC_LEGACY_FEATURES").unwrap_or("full,feat-ibc,testnet".to_string());

let res = std::process::Command::new(shell)
.env_clear()
.env("OUT_DIR", std::env::var("OUT_DIR").unwrap())
.env("PATH", std::env::var("PATH").unwrap())
.env("NOMIC_LEGACY_REV", rev)
.env("CARGO_FEATURES", cargo_features)
.args(["build.sh"])
.spawn()
.unwrap()
Expand Down
7 changes: 4 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ BUILD_DIR=$OUT_DIR/nomic
NOMIC_LEGACY_PATH=$OUT_DIR/nomic-$NOMIC_LEGACY_REV

if [ ! -f "$NOMIC_LEGACY_PATH" ]; then
echo "Building legacy nomic at $BUILD_DIR..."
echo "Building legacy nomic at $NOMIC_LEGACY_PATH..."
if [ ! -d "$BUILD_DIR" ]; then
git clone https://github.com/nomic-io/nomic.git $BUILD_DIR
fi
Expand All @@ -17,8 +17,9 @@ if [ ! -f "$NOMIC_LEGACY_PATH" ]; then
git checkout $NOMIC_LEGACY_REV

rustc --version
cargo build --release
mv $BUILD_DIR/target/release/nomic $NOMIC_LEGACY_PATH
echo "Building with features: $CARGO_FEATURES"
cargo build --release --no-default-features --features $CARGO_FEATURES
cp $BUILD_DIR/target/release/nomic $NOMIC_LEGACY_PATH
else
echo "Skipping legacy nomic binary build (already exists at $NOMIC_LEGACY_PATH)"
fi
Expand Down
4 changes: 3 additions & 1 deletion rest/Cargo.lock

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

0 comments on commit 18b1187

Please sign in to comment.