Skip to content

Commit

Permalink
[feature] #3454: make LTS the default
Browse files Browse the repository at this point in the history
Signed-off-by: Marin Veršić <marin.versic101@gmail.com>
  • Loading branch information
mversic authored and Github Actions Bot committed May 5, 2023
1 parent d760772 commit d3c24e8
Show file tree
Hide file tree
Showing 23 changed files with 422 additions and 530 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/iroha2-dev-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Check genesis.json
if: always()
run: ./scripts/check.sh genesis
- name: Check client_cli/config.json
- name: Check client/config.json
if: always()
run: ./scripts/check.sh client
- name: Check peer/config.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/iroha2-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
run: |
sleep 10s
echo "wait to other workflow"
- uses: convictional/trigger-workflow-and-wait@v1.6.2
- uses: convictional/trigger-workflow-and-wait@v1.6.5
with:
owner: soramitsu
repo: iroha2-longevity-load-rs
Expand Down
22 changes: 20 additions & 2 deletions .github/workflows/iroha2-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,28 @@ jobs:
cache-from: type=gha
cache-to: type=gha,mode=max

load-rs:
configs:
runs-on: ubuntu-latest
container:
image: hyperledger/iroha2-ci:nightly-2022-12-22
steps:
- uses: actions/checkout@v3
ref: iroha2-dev
- name: Setup git config
run: |
git config user.name "GitHub Actions Bot"
git config user.email "<>"
- name: Update configs
run: |
./configs/update_configs.sh lts
./configs/update_configs.sh stable
- name: Commit config changes
run: |
git commit -am "[documentation]: Update lts/stable configs following a release" --signoff
git push origin iroha2-dev
load-rs:
runs-on: ubuntu-latest
steps:
- name: Get tag from branch name
run: |
Expand All @@ -67,7 +85,7 @@ jobs:
run: |
sleep 10s
echo "wait to finish other workflow"
- uses: convictional/trigger-workflow-and-wait@v1.6.2
- uses: convictional/trigger-workflow-and-wait@v1.6.5
with:
owner: soramitsu
repo: iroha2-longevity-load-rs
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ docker compose up
With the `docker-compose` instance running, use [Iroha Client CLI](./client_cli/README.md):

```bash
cp configs/client_cli/config.json target/debug/config.json
cp configs/client/config.json target/debug/config.json
cd target/debug
./iroha_client_cli --help
```
Expand Down
5 changes: 2 additions & 3 deletions cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,8 @@ async fn main() -> Result<(), color_eyre::Report> {
iroha_logger::warn!("The configuration parameter `DISABLE_PANIC_TERMINAL_COLORS` is deprecated. Set `TERMINAL_COLORS=false` instead. ")
}
iroha_logger::info!(
git_commit_sha = env!("VERGEN_GIT_SHA"),
"Hyperledgerいろは2にようこそ!(translation) Welcome to Hyperledger Iroha {}!",
env!("CARGO_PKG_VERSION")
version = %env!("CARGO_PKG_VERSION"), git_commit_sha = env!("VERGEN_GIT_SHA"),
"Hyperledgerいろは2にようこそ!(translation) Welcome to Hyperledger Iroha!"
);

let genesis = if let Some(genesis_path) = &args.genesis_path {
Expand Down
4 changes: 2 additions & 2 deletions client/examples/tutorial.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ use iroha_data_model::TryToValue;

fn main() {
// #region rust_config_load
let config_loc = "../configs/client_cli/config.json";
let config_loc = "../configs/client/config.json";
let file = File::open(config_loc)
.wrap_err("Unable to load the configuration file at `.....`")
.expect("Config file is loading normally.");
let config: Configuration = serde_json::from_reader(file)
.wrap_err("Failed to parse `../configs/client_cli/config.json`")
.wrap_err("Failed to parse `../configs/client/config.json`")
.expect("Verified in tests");
// #endregion rust_config_load

Expand Down
2 changes: 1 addition & 1 deletion config/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ mod tests {
use super::*;
use crate::torii::{uri::DEFAULT_API_URL, DEFAULT_TORII_TELEMETRY_URL};

const CONFIGURATION_PATH: &str = "../configs/client_cli/config.json";
const CONFIGURATION_PATH: &str = "../configs/client/config.json";

prop_compose! {
// TODO: make tests to check generated key validity
Expand Down
File renamed without changes.
Loading

0 comments on commit d3c24e8

Please sign in to comment.