diff --git a/.github/workflows/ci_wasm_build_ubuntu.yaml b/.github/workflows/ci_wasm_build_ubuntu.yaml deleted file mode 100644 index 22fddfd1b78..00000000000 --- a/.github/workflows/ci_wasm_build_ubuntu.yaml +++ /dev/null @@ -1,68 +0,0 @@ -name: ci_wasm_build_ubuntu -concurrency: - group: ci_wasm_build_ubuntu-${{ github.ref }} - cancel-in-progress: true -on: - pull_request: - types: [ opened, synchronize, reopened ] - push: - branches: - - master - - develop - - 'rc/*' - merge_group: {} - -env: - CARGO_TERM_COLOR: always - RUST_BACKTRACE: full - RUSTFLAGS: -D warnings -jobs: - prologue: - name: prologue - if: | - github.event_name != 'push' || - ( github.event_name == 'push' && - ( github.ref == 'refs/heads/master' || - (github.ref == 'refs/heads/develop' && startsWith(github.event.head_commit.message, 'Merge pull request #')) || - startsWith(github.ref, 'refs/heads/rc/') - ) - ) || (github.repository_owner != 'nervosnetwork') - runs-on: ubuntu-20.04 - outputs: - os_skip: ${{ steps.prologue.outputs.os_skip }} - job_skip: ${{ steps.prologue.outputs.job_skip }} - linux_runner_label: ${{ steps.prologue.outputs.linux_runner_label }} - steps: - - uses: actions/checkout@v3 - - name: prologue - id: prologue - uses: ./.github/actions/ci_prologue - with: - GITHUB_EVENT_NAME: ${{ github.event_name }} - COMMIT_MESSAGE: "${{github.event.head_commit.message}}" - PR_COMMONS_BODY: "${{ github.event.pull_request.body }}" - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - LABELS: "${{ toJson(github.event.pull_request.labels.*.name) }}" - GITHUB_REPOSITORY: ${{ github.repository }} - GITHUB_WORKFLOW: ${{ github.workflow }} - ci_wasm_build_ubuntu: - name: ci_wasm_build_ubuntu - needs: prologue - runs-on: ${{ needs.prologue.outputs.linux_runner_label }} - steps: - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: 1.71.1 - - run: sudo apt-get update && sudo apt-get install -y pkg-config clang - - uses: actions/checkout@v3 - - name: ci_wasm_build_ubuntu - run: | - if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then - devtools/ci/ci_main.sh - else - echo "skip job" - exit 0 - fi - env: - RUNNER_LABEL: ${{ needs.prologue.outputs.runner_label }} diff --git a/Makefile b/Makefile index dd834bb4082..13f5f155570 100644 --- a/Makefile +++ b/Makefile @@ -67,10 +67,6 @@ cov: cov-install-tools ## Run code coverage. RUSTFLAGS="-Zinstrument-coverage" LLVM_PROFILE_FILE="${COV_PROFRAW_DIR}/ckb-cov-%p-%m.profraw" cargo +nightly-2022-03-22 test --all GRCOV_OUTPUT=lcov-unit-test.info make cov-collect-data -.PHONY: wasm-build-test -wasm-build-test: ## Build core packages for wasm target - cp -f Cargo.lock wasm-build-test/ - cd wasm-build-test && cargo build --target=wasm32-unknown-unknown .PHONY: setup-ckb-test setup-ckb-test: diff --git a/devtools/ci/ci_main.sh b/devtools/ci/ci_main.sh index 25623ed7f95..75d5db62e83 100755 --- a/devtools/ci/ci_main.sh +++ b/devtools/ci/ci_main.sh @@ -61,11 +61,6 @@ case $GITHUB_WORKFLOW in make check-dirty-hashes-toml devtools/ci/check-cyclic-dependencies.py ;; - ci_wasm_build*) - echo "ci_WASM_build" - rustup target add wasm32-unknown-unknown - make wasm-build-test - ;; ci_aarch64_build*) echo "ci_aarch64_build" sudo apt-get install -y gcc-multilib diff --git a/wasm-build-test/Cargo.toml b/wasm-build-test/Cargo.toml deleted file mode 100644 index 72d1bc9060e..00000000000 --- a/wasm-build-test/Cargo.toml +++ /dev/null @@ -1,17 +0,0 @@ -[package] -name = "ckb-wasm-test" -version = "0.113.0-pre" -license = "MIT" -authors = ["Nervos Core Dev "] -edition = "2021" -description = "Testsuite to ensure some crates work with diffent features." -homepage = "https://github.com/nervosnetwork/ckb" -repository = "https://github.com/nervosnetwork/ckb" - -[dependencies] -ckb-gen-types = { path = "../util/gen-types", version = "= 0.113.0-pre" } -ckb-script = { path = "../script", version = "= 0.113.0-pre", default-features = false, features = [] } - -# Prevent this from interfering with workspaces -[workspace] -members = ["."] diff --git a/wasm-build-test/src/lib.rs b/wasm-build-test/src/lib.rs deleted file mode 100644 index a04e00e4bb4..00000000000 --- a/wasm-build-test/src/lib.rs +++ /dev/null @@ -1,4 +0,0 @@ -// We just need a dummy package to test building dependencies, those -// lines here prevent errors from devtools/ci/check-cargotoml.sh -extern crate ckb_script; -extern crate ckb_gen_types;