diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ebb92c8..9c2aad0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,7 +141,7 @@ jobs: - uses: Swatinem/rust-cache@v2 with: - key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}-${{ matrix.binary }}-with-ias + key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}-${{ matrix.binary }} - name: Release if: ${{ matrix.binary == 'release' }} @@ -163,64 +163,6 @@ jobs: env: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - build_dev_ias_binaries: - name: Development build ${{ matrix.binary }} for ${{ matrix.rust-target }} on (${{ matrix.os }}) - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-20.04] - rust: [stable] - binary: [release] - env: - RUST_BACKTRACE: full - RUSTV: ${{ matrix.rust }} - TARGET: ${{ matrix.rust-target }} - RUST_BIN_DIR: target/${{ matrix.rust-target }}/debug - RELEASE_NAME: debug - steps: - - uses: actions/checkout@v3 - - - name: Print env - run: | - echo "RUST_BIN_DIR = ${{ env.RUST_BIN_DIR }} " - - # With rustup's nice new toml format, we just need to run rustup show to install the toolchain - # https://github.com/actions-rs/toolchain/issues/126#issuecomment-782989659 - - name: Setup Rust toolchain - run: rustup show - - - name: Install dependencies - run: | - sudo apt update && \ - sudo apt install --assume-yes protobuf-compiler - - - name: Install llvm-10 - run: sudo apt-get install llvm-10 clang-10 - - - uses: Swatinem/rust-cache@v2 - with: - key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}-${{ matrix.binary }}-with-ias - - - name: Release - if: ${{ matrix.binary == 'release' }} - run: cargo build --release --locked --features skip-extrinsic-filtering - - # Upload artifacts - - name: Upload integritee-node-dev-ias - uses: actions/upload-artifact@v3 - with: - name: integritee-node-dev-ias-${{ github.sha }} - path: target/release/integritee-node - - - name: Slack Notification - uses: 8398a7/action-slack@v3 - if: failure() - with: - status: ${{ job.status }} - fields: repo,message,commit,author,action,eventName,ref,workflow,job,took # selectable (default: repo,message) - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - build_benchmark_binaries: name: Benchmarking build ${{ matrix.binary }} for ${{ matrix.rust-target }} on (${{ matrix.os }}) runs-on: ${{ matrix.os }} @@ -257,7 +199,7 @@ jobs: - uses: Swatinem/rust-cache@v2 with: - key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}-${{ matrix.binary }}-with-ias + key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}-${{ matrix.binary }} - name: Build benchmarking binary if: ${{ matrix.binary == 'release' }} @@ -486,7 +428,7 @@ jobs: name: Draft Release if: startsWith(github.ref, 'refs/tags/') runs-on: ubuntu-latest - needs: [create_artifacts, build_live_binaries, build_dev_binaries, build_dev_ias_binaries, check] + needs: [create_artifacts, build_live_binaries, build_dev_binaries, check] outputs: release_url: ${{ steps.create-release.outputs.html_url }} asset_upload_url: ${{ steps.create-release.outputs.upload_url }} @@ -499,12 +441,6 @@ jobs: name: integritee-node-dev-${{ github.sha }} path: integritee-node-dev-tmp - - name: Download Integritee Collator - uses: actions/download-artifact@v3 - with: - name: integritee-node-dev-ias-${{ github.sha }} - path: integritee-node-dev-ias-tmp - - name: Download Integritee Collator uses: actions/download-artifact@v3 with: @@ -513,9 +449,6 @@ jobs: - name: Move binaries run: mv integritee-node-dev-tmp/integritee-node ./integritee-node-dev - - name: Move binaries - run: mv integritee-node-dev-ias-tmp/integritee-node ./integritee-node-dev-ias - - name: Create required package.json run: test -f package.json || echo '{}' >package.json @@ -539,7 +472,6 @@ jobs: files: | integritee-node integritee-node-dev - integritee-node-dev-ias - name: Slack Notification uses: 8398a7/action-slack@v3 diff --git a/.github/workflows/delete-release.yml b/.github/workflows/delete-release.yml index a30d6ea..9ce5eaa 100644 --- a/.github/workflows/delete-release.yml +++ b/.github/workflows/delete-release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - binary: ["integritee-node", "integritee-node-dev", "integritee-node-dev-ias" ] + binary: ["integritee-node", "integritee-node-dev" ] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/publish-docker-release.yml b/.github/workflows/publish-docker-release.yml index 54f0081..c14145f 100644 --- a/.github/workflows/publish-docker-release.yml +++ b/.github/workflows/publish-docker-release.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - binary: ["integritee-node", "integritee-node-dev", "integritee-node-dev-ias"] + binary: ["integritee-node", "integritee-node-dev"] steps: - uses: actions/checkout@v3 diff --git a/README.md b/README.md index f737513..9d196df 100644 --- a/README.md +++ b/README.md @@ -7,19 +7,13 @@ A substrate-based node that maintains a registry of remote attested integritee-s ## Build and Run 1. See the substrate install docs to install the preliminaries: [https://docs.substrate.io/install](https://docs.substrate.io/install). 2. Build the node: - - If you can perform Remote Attestation: - ``` - cargo build --release --features "skip-extrinsic-filtering" - ``` - - If you can **NOT** perform Remote Attestation: - ``` - cargo build --release --features "skip-extrinsic-filtering skip-ias-check" - ``` + ``` + cargo build --release --features "skip-extrinsic-filtering" + ``` ### Note There are some cargo features that are highly relevant for developers: -* `skip-ias-check`: allow registering enclaves without attestation report. * `skip-extrinsic-filtering`: We have a defensive filter for transfer extrinsics as we have an old solo-node running for archive purposes, which mustn't allow transfers. The filter can be deactivated with this feature. ## Versioning