-
Notifications
You must be signed in to change notification settings - Fork 236
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into ckb2021-develop
- Loading branch information
Showing
31 changed files
with
248 additions
and
410 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,17 +33,13 @@ jobs: | |
- os: win-runner | ||
script_run: devtools/windows/make test | ||
CI: true | ||
ImageOS: 'windows-2019' | ||
BUILD_BUILDID: ${{ github.sha }} | ||
needs: Security_Audit_Licenses | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- name: UnitTest | ||
run: ${{ matrix.script_run }} | ||
env: | ||
CI: ${{ matrix.CI }} | ||
SENTRY_DSN: ${{ matrix.SENTRY_DSN }} | ||
ImageOS: ${{ matrix.ImageOS }} | ||
|
||
Integration_Test: | ||
runs-on: ${{ matrix.os }} | ||
|
@@ -57,16 +53,23 @@ jobs: | |
script_run: make CKB_TEST_SEC_COEFFICIENT=5 CKB_TEST_ARGS="-c 4 --no-report" integration | ||
- os: win-runner | ||
script_run: devtools/windows/make CKB_TEST_SEC_COEFFICIENT=5 CKB_TEST_ARGS="-c 4 --no-report" integration | ||
CI: true | ||
SENTRY_DSN: "https://[email protected]/7" | ||
needs: Security_Audit_Licenses | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- name: Integration_Test | ||
run: ${{ matrix.script_run }} | ||
- name: Post Run - Upload integration Result when failed | ||
if: ${{ failure() }} | ||
uses: actions/upload-artifact@v2 | ||
with: | ||
name: ${{ matrix.os }}_integration.log | ||
path: ${{ env.CKB_INTEGRATION_TEST_TMP }}/integration.log | ||
env: | ||
CI: ${{ matrix.CI }} | ||
CI: true | ||
SENTRY_DSN: ${{ matrix.SENTRY_DSN }} | ||
ImageOS: ${{matrix.os}} | ||
BUILD_BUILDID: ${{ github.run_id }} | ||
|
||
Benchmarks_Test: | ||
runs-on: ${{ matrix.os }} | ||
|
@@ -151,47 +154,6 @@ jobs: | |
make check-crates | ||
make check-licenses | ||
Cyclic_dev_dependencies: | ||
if: | | ||
contains(fromJson('[ "refs/heads/master", "refs/heads/trying","refs/heads/staging", "refs/heads/staging2" ]'), github.ref) | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
matrix: | ||
os: [Linux-runner, mac-runner] | ||
needs: Security_Audit_Licenses | ||
continue-on-error: true | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- name: Cyclic_dev_dependencies | ||
run: | | ||
devtools/ci/check-cyclic-dependencies.py --dev | ||
Latest_Linters: | ||
if: | | ||
contains(fromJson('[ "refs/heads/master", "refs/heads/trying","refs/heads/staging", "refs/heads/staging2" ]'), github.ref) | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
matrix: | ||
os: [Linux-runner, mac-runner] | ||
include: | ||
- os: Linux-runner | ||
script_run: rustup component add rustfmt --toolchain stable-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain stable-x86_64-unknown-linux-gnu | ||
- os: mac-runner | ||
script_run: rustup component add rustfmt-preview && rustup component add clippy-preview | ||
needs: Cyclic_dev_dependencies | ||
continue-on-error: true | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- name: Pre install | ||
run: ${{ matrix.script_run }} | ||
- name: Latest_Linters | ||
run: | | ||
mv rust-toolchain rust-toolchain.bak | ||
echo "stable" > rust-toolchain | ||
make fmt | ||
make clippy | ||
mv rust-toolchain.bak rust-toolchain | ||
ci-success: | ||
name: ci | ||
needs: | ||
|
Oops, something went wrong.