Skip to content

Commit

Permalink
Pilot (#498)
Browse files Browse the repository at this point in the history
* start pilot as detached

* add killall ol, to stop-all, cleanup

* rename ol-cli crate -> ol

* pilot refactor to not redo dynamnic checks

* make pilot optional in explorer


Co-authored-by: liangping <[email protected]>
Co-authored-by: name <email>
  • Loading branch information
0o-de-lally and liangping authored May 17, 2021
1 parent 5c8aff8 commit 4c66934
Show file tree
Hide file tree
Showing 39 changed files with 1,506 additions and 598 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ jobs:
tag: ${{ github.ref }}
overwrite: true
- name: Web
run: zip -r web-monitor.zip ol/cli/web-monitor
run: cd ol/cli/web-monitor/public/; zip -r web-monitor.zip *
- name: Upload Web Files
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: web-monitor.zip
file: ol/cli/web-monitor/public/web-monitor.zip
file_glob: true
tag: ${{ github.ref }}
overwrite: true
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/upgrade.yaml

This file was deleted.

17 changes: 12 additions & 5 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ifndef RELEASE
RELEASE=$(shell curl -sL https://api.github.com/repos/OLSF/libra/releases/latest | jq -r '.assets[].browser_download_url')
endif

BINS= db-backup db-backup-verify db-restore libra-node miner ol_cli txs stdlib
BINS= db-backup db-backup-verify db-restore libra-node miner ol txs stdlib



Expand Down Expand Up @@ -90,15 +90,15 @@ bins:
cargo run -p stdlib --release

# NOTE: stdlib is built for cli bindings
cargo build -p libra-node -p miner -p backup-cli -p ol-cli -p txs -p onboard --release
cargo build -p libra-node -p miner -p backup-cli -p ol -p txs -p onboard --release

install:
sudo cp -f ${SOURCE}/target/release/miner /usr/local/bin/miner
sudo cp -f ${SOURCE}/target/release/libra-node /usr/local/bin/libra-node
sudo cp -f ${SOURCE}/target/release/db-restore /usr/local/bin/db-restore
sudo cp -f ${SOURCE}/target/release/db-backup /usr/local/bin/db-backup
sudo cp -f ${SOURCE}/target/release/db-backup-verify /usr/local/bin/db-backup-verify
sudo cp -f ${SOURCE}/target/release/ol_cli /usr/local/bin/ol
sudo cp -f ${SOURCE}/target/release/ol /usr/local/bin/ol
sudo cp -f ${SOURCE}/target/release/txs /usr/local/bin/txs
sudo cp -f ${SOURCE}/target/release/onboard /usr/local/bin/onboard

Expand Down Expand Up @@ -377,7 +377,7 @@ dev-join: clear fix fix-genesis dev-wizard
# mock restore backups from dev-epoch-archive
rm -rf ~/.0L/restore
# restore from MOCK archive OLSF/dev-epoch-archive
cargo r -p ol-cli -- restore
cargo r -p ol -- restore
# start a node with fullnode.node.yaml configs
make start-full

Expand Down
3 changes: 2 additions & 1 deletion ol/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "ol-cli"
name = "ol"
authors = []
version = "0.1.0"
edition = "2018"
Expand Down Expand Up @@ -57,6 +57,7 @@ ol-types = { path = "../../ol/types"}
storage-interface = { path = "../../storage/storage-interface", version = "0.1.0" }
fs_extra = "1"
gag = "0.1.10"
port_scanner = "0.1.5"

# Parity with Storage create
[dependencies.rocksdb]
Expand Down
2 changes: 1 addition & 1 deletion ol/cli/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ol-cli
# ol

This is the entrypoint for monitoring, management, and configuration tools for 0L.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#![deny(warnings, missing_docs, trivial_casts, unused_qualifications)]
#![forbid(unsafe_code)]

use ol_cli::application::APPLICATION;
use ol::application::APPLICATION;

/// Boot OlCli
fn main() {
Expand Down
Loading

0 comments on commit 4c66934

Please sign in to comment.