Skip to content

Commit

Permalink
Merge branch 'v1.0-dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.pnp.cjs
#	yarn.lock
  • Loading branch information
shumkov committed Nov 2, 2023
2 parents f285b02 + 0b86cd2 commit e07af7a
Show file tree
Hide file tree
Showing 931 changed files with 75,569 additions and 77,481 deletions.
5 changes: 3 additions & 2 deletions .github/actions/rust/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ name: "Rust Dependencies"
description: "Install dependencies"
inputs:
toolchain:
description: Rust toolchain to use, stable / nightly / beta
default: stable
description: Rust toolchain to use, stable / nightly / beta, or exact version
# The same as in /README.md
default: "1.73"
target:
description: Target Rust platform
required: false
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/all-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/rust
with:
toolchain: stable
target: wasm32-unknown-unknown

- name: Build SDK
Expand Down Expand Up @@ -180,7 +179,7 @@ jobs:
run: yarn workspace dash test:functional

- name: Run test suite
run: yarn test:suite
run: yarn test:suite -b

- name: Show Docker logs
if: ${{ failure() }}
Expand Down Expand Up @@ -212,7 +211,6 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/rust
with:
toolchain: stable
target: wasm32-unknown-unknown

- name: Build SDK
Expand Down Expand Up @@ -338,7 +336,6 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/rust
with:
toolchain: stable
target: wasm32-unknown-unknown

- name: Build package and dependencies
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/dapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ on:
- .github/workflows/js-checks.yml
- packages/dapi/**
- packages/dapi-grpc/**
- packages/js-dpp/**
- packages/rs-dpp/**
- packages/wasm-dpp/**
- packages/js-grpc-common/**
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/dashmate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ on:
- packages/wallet-lib/**
- packages/js-dapi-client/**
- packages/dapi-grpc/**
- packages/js-dpp/**
- packages/wasm-dpp/**
- packages/rs-dpp/**
- packages/js-grpc-common/**
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/dashpay-contract.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ on:
- .github/workflows/dashpay-contract.yml
- .github/workflows/checks.yml
- packages/dashpay-contract/**
- packages/js-dpp/**
- packages/wasm-dpp/**
- packages/rs-dpp/**
- packages/feature-flags-contract/**
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/js-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/rust
with:
toolchain: stable
target: wasm32-unknown-unknown

- name: Build package and dependencies
Expand Down Expand Up @@ -86,7 +85,6 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/rust
with:
toolchain: stable
target: wasm32-unknown-unknown

- name: Build package and dependencies
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/js-dapi-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ on:
- .github/workflows/js-checks.yml
- packages/js-dapi-client/**
- packages/dapi-grpc/**
- packages/js-dpp/**
- packages/js-grpc-common/**
- packages/dashpay-contract/**
- packages/feature-flags-contract/**
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/js-dash-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ on:
- packages/wallet-lib/**
- packages/js-dapi-client/**
- packages/dapi-grpc/**
- packages/js-dpp/**
- packages/js-grpc-common/**
- packages/dashpay-contract/**
- packages/feature-flags-contract/**
Expand Down
32 changes: 0 additions & 32 deletions .github/workflows/js-dpp.yml

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/platform-test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ on:
- packages/wallet-lib/**
- packages/js-dapi-client/**
- packages/dapi-grpc/**
- packages/js-dpp/**
- packages/js-grpc-common/**
- packages/dashpay-contract/**
- packages/feature-flags-contract/**
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/rust
with:
toolchain: stable
target: wasm32-unknown-unknown

- name: Setup Node.JS
Expand Down Expand Up @@ -308,7 +307,6 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/rust
with:
toolchain: stable
target: wasm32-unknown-unknown

# TODO: We don't need to build it, since pack should use released npm packages
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/rs-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/rust
with:
toolchain: stable
components: clippy

- uses: clechasseur/rs-clippy-check@v3
Expand All @@ -39,7 +38,6 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/rust
with:
toolchain: stable
components: rustfmt

- name: Check formatting
Expand All @@ -57,7 +55,6 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/rust
with:
toolchain: stable
target: wasm32-unknown-unknown

- run: cargo check --package=${{ inputs.package }}
Expand Down Expand Up @@ -130,7 +127,6 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/rust
with:
toolchain: stable
target: wasm32-unknown-unknown

- name: Run tests
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/rs-features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/rust
with:
toolchain: stable
target: wasm32-unknown-unknown

- name: Install yq
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/wallet-lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ on:
- packages/wallet-lib/**
- packages/js-dapi-client/**
- packages/dapi-grpc/**
- packages/js-dpp/**
- packages/js-grpc-common/**
- packages/dashpay-contract/**
- packages/feature-flags-contract/**
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/wasm-dpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ on:
- v[0-9]+\.[0-9]+-dev
paths:
- .github/workflows/wasm-dpp.yml
- .github/workflows/js-dpp.yml
- .github/workflows/js-checks.yml
- .github/workflows/rs-checks.yml
- packages/js-dpp/**
- packages/feature-flags-contract/**
- packages/masternode-reward-shares-contract/**
- packages/dpns-contract/**
Expand Down Expand Up @@ -42,7 +40,7 @@ jobs:

wasm-errors:
name: WASM compilation
runs-on: [ "self-hosted", "linux", "x64", "ubuntu-platform" ]
runs-on: ["self-hosted", "linux", "x64", "ubuntu-platform"]
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' || !github.event.pull_request.draft }}
timeout-minutes: 15
steps:
Expand All @@ -52,7 +50,6 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/rust
with:
toolchain: stable
target: wasm32-unknown-unknown

- name: Compile WASM
Expand Down
Loading

0 comments on commit e07af7a

Please sign in to comment.