Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
s8sato authored and mversic committed May 13, 2022
1 parent 3040435 commit 4c391a2
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/iroha2-dev-pr-unstable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
- uses: actions/checkout@v2
- uses: Swatinem/rust-cache@v1
- name: Run tests
run: cargo test -p iroha_client --tests unstable_network --quiet
run: mold --run cargo test -p iroha_client --tests unstable_network --quiet
2 changes: 1 addition & 1 deletion .github/workflows/iroha2-dev-pr-wasm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ jobs:

# Tests
- name: Run tests
run: mold -run cargo test --tests --quiet --no-fail-fast
run: mold --run cargo test --tests --quiet --no-fail-fast
7 changes: 3 additions & 4 deletions .github/workflows/iroha2-dev-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ on:

env:
CARGO_TERM_COLOR: always
RUSTC_BOOTSTRAP: 1

jobs:
test:
Expand All @@ -35,7 +34,7 @@ jobs:
working-directory: actor
if: always()
- name: Verify wasm smartcontracts are able to build
run: mold -run cargo build --target wasm32-unknown-unknown --quiet
run: mold --run cargo build --target wasm32-unknown-unknown --quiet
working-directory: wasm
env:
RUSTC_BOOTSTRAP: 1
Expand All @@ -62,7 +61,7 @@ jobs:
- uses: Swatinem/rust-cache@v1
- name: Run tests
run: |
mold --run cargo +nightly-2022-04-20 test \
mold --run cargo test \
--quiet --workspace --no-fail-fast -- \
--skip unstable_network --skip ui --test-threads 3
env:
Expand All @@ -73,7 +72,7 @@ jobs:
grcov . --binary-path ./target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" -o lcov.info
if: always()
- name: Upload coverage to codecov.io
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v2
if: always()
with:
file: lcov.info
24 changes: 12 additions & 12 deletions .github/workflows/iroha2-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
env:
CARGO_TERM_COLOR: always

# Note jobs in this workflow are run on `push` meaning that there's
# no point in burning our AWS self-hosted runners' time. Hence
# `ubuntu-latest` and not `[self-hosted, Linux]`.
# Note jobs in this workflow are run on `push` meaning that there's
# no point in burning our AWS self-hosted runners' time. Hence
# `ubuntu-latest` and not `[self-hosted, Linux]`.
jobs:
deploy:
runs-on: ubuntu-latest
Expand All @@ -28,7 +28,7 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push Iroha Docker image
- name: Build and push docker image
uses: docker/build-push-action@v2
with:
context: .
Expand All @@ -37,7 +37,7 @@ jobs:
build-args: |
TARGET_DIR=release
PROFILE=--release
- name: Build and push Iroha client cli Docker image
- name: Build and push docker image (iroha_client_cli)
uses: docker/build-push-action@v2
with:
context: .
Expand All @@ -47,7 +47,7 @@ jobs:
TARGET_DIR=release
PROFILE=--release
BIN=iroha_client_cli
- name: Build and push Iroha Crypto CLI Docker image
- name: Build and push docker image (kagami)
uses: docker/build-push-action@v2
with:
context: .
Expand All @@ -58,7 +58,7 @@ jobs:
PROFILE=--release
BIN=kagami
- name: Build and push load-rs:dev docker image
- name: Build and push docker image (load-rs:dev)
run: |
sleep 10s
echo "wait to other workflow"
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
- uses: actions/checkout@v2
- uses: Swatinem/rust-cache@v1
- name: Build
run: cargo build --release --verbose
run: mold --run cargo build --release --verbose
- name: Archive build
uses: actions/upload-artifact@v2
with:
Expand All @@ -116,7 +116,7 @@ jobs:
- name: Run schema generation
run: |
mkdir -p target/schema
cargo run --bin kagami -- schema > target/schema/schema.json
cargo run --bin kagami -- schema >target/schema/schema.json
- name: Upload schema
uses: actions/upload-artifact@v2
with:
Expand All @@ -139,7 +139,7 @@ jobs:
- name: Run release tests and save telemetry
env:
TELEMETRY_FILE: ../target/telemetry/release.json.lz4
run: cargo test -p iroha_client --all-features --release -- unstable_network || true
run: mold --run cargo test -p iroha_client --all-features --release -- unstable_network || true
- name: Install script dependencies
run: |
apt-get update
Expand Down Expand Up @@ -187,7 +187,7 @@ jobs:
- uses: Swatinem/rust-cache@v1
- name: Run tests
run: |
mold --run cargo +nightly-2022-04-20 test \
mold --run cargo test \
--quiet --workspace --no-fail-fast -- \
--skip unstable_network --skip ui --test-threads 3
env:
Expand All @@ -198,7 +198,7 @@ jobs:
grcov . --binary-path ./target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" -o lcov.info
if: always()
- name: Upload coverage to codecov.io
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v2
if: always()
with:
file: lcov.info
14 changes: 7 additions & 7 deletions .github/workflows/iroha2-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
- uses: actions/checkout@v2
- uses: Swatinem/rust-cache@v1
- name: Build Client CLI
run: mold -run cargo build
run: mold --run cargo build
working-directory: client_cli
- name: Build Iroha Peer
run: mold -run cargo build
run: mold --run cargo build
working-directory: cli
- name: Mark both binaries as executable
run: |
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
id: buildx
uses: docker/setup-buildx-action@v1
- name: Build Client CLI
run: mold -run cargo build
run: mold --run cargo build
working-directory: client_cli
- name: Build and push Iroha Docker image
uses: docker/build-push-action@v2
Expand All @@ -79,7 +79,7 @@ jobs:
- uses: actions/checkout@v2
- uses: Swatinem/rust-cache@v1
- name: Run benchmarks
run: mold -run cargo bench --workspace --quiet
run: mold --run cargo bench --workspace --quiet

# ------------------------------ SDK tests go here ------------------------

Expand All @@ -103,10 +103,10 @@ jobs:
restore-keys: |
${{ runner.os }}-gradle-
- name: Build Iroha Peer
run: mold -run cargo build
run: mold --run cargo build
working-directory: cli
- name: Build Client CLI
run: mold -run cargo build
run: mold --run cargo build
working-directory: client_cli
- name: Mark both binaries as executable
run: |
Expand Down Expand Up @@ -135,4 +135,4 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Run long tests
run: cargo test --workspace --no-fail-fast -- --ignored --test-threads=1 long
run: mold --run cargo test --workspace --no-fail-fast -- --ignored --test-threads=1 long
17 changes: 6 additions & 11 deletions .github/workflows/iroha2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,8 @@ on:

env:
CARGO_TERM_COLOR: always
RUSTC_BOOTSTRAP: 1

jobs:
# Coverage is both in PR and in push pipelines so that:
# 1. PR can get coverage report from bot.
# 2. Coverage bot can have results from
# `iroha2-dev` to report coverage changes.
coverage:
runs-on: ubuntu-latest
container:
Expand All @@ -22,7 +17,7 @@ jobs:
- uses: Swatinem/rust-cache@v1
- name: Run tests
run: |
mold --run cargo +nightly-2022-04-20 test \
mold --run cargo test \
--quiet --workspace --no-fail-fast -- \
--skip unstable_network --skip ui --test-threads 3
env:
Expand All @@ -33,7 +28,7 @@ jobs:
grcov . --binary-path ./target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" -o lcov.info
if: always()
- name: Upload coverage to codecov.io
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v2
if: always()
with:
file: lcov.info
Expand All @@ -56,7 +51,7 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push Iroha Docker image
- name: Build and push docker image
uses: docker/build-push-action@v2
with:
context: .
Expand All @@ -65,7 +60,7 @@ jobs:
build-args: |
TARGET_DIR=release
PROFILE=--release
- name: Build and push Iroha client cli Docker image
- name: Build and push docker image (iroha_client_cli)
uses: docker/build-push-action@v2
with:
context: .
Expand All @@ -75,7 +70,7 @@ jobs:
TARGET_DIR=release
PROFILE=--release
BIN=iroha_client_cli
- name: Build and push Iroha Crypto CLI Docker image
- name: Build and push docker image (kagami)
uses: docker/build-push-action@v2
with:
context: .
Expand All @@ -86,7 +81,7 @@ jobs:
PROFILE=--release
BIN=kagami
- name: Build and push load-rs:release docker image
- name: Build and push docker image (load-rs:release)
run: |
sleep 10s
echo "wait to finish other workflow"
Expand Down

0 comments on commit 4c391a2

Please sign in to comment.