diff --git a/.github/workflows/tests-rust.yml b/.github/workflows/tests-rust.yml deleted file mode 100644 index 1977a321..00000000 --- a/.github/workflows/tests-rust.yml +++ /dev/null @@ -1,62 +0,0 @@ -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -on: - workflow_dispatch: - push: - -env: - CARGO_TERM_COLOR: always - CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse - -jobs: - test: - strategy: - matrix: - os: [ubuntu-20.04, ubuntu-22.04] - - runs-on: [self-hosted, '${{ matrix.os }}'] - steps: - - uses: actions/checkout@v4 - - - uses: actions/cache@v3 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - ./target - key: ${{ matrix.os }}-geyser-plugin-runner-${{ hashFiles('rust-toolchain.toml') }}-${{ hashFiles('**/Cargo.lock') }}-0001 - restore-keys: | - ${{ matrix.os }}-geyser-plugin-runner - - - name: Set rust version - run: | - RUST_VERSION="$(./ci/rust-version.sh)" - echo "RUST_VERSION=$RUST_VERSION" >> "$GITHUB_ENV" - - - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ env.RUST_VERSION }} - profile: minimal - components: clippy, rustfmt - - - name: Enter the geyser-plugin-runner directory - run: cd geyser-plugin-runner - - - name: cargo tree - run: | - cargo tree - git checkout Cargo.lock - cargo tree --frozen --offline - - - name: Run fmt - run: cargo fmt --all -- --check - - - name: Run clippy - run: cargo clippy --all-targets --tests -- -Dwarnings - - - name: Run test - run: cargo test --all-targets diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d98eb839..be0ed15c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,4 +1,9 @@ on: [pull_request] + +env: + CARGO_TERM_COLOR: always + CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse + name: tests jobs: test: @@ -18,3 +23,52 @@ jobs: fetch-depth: 0 - name: Test run: go test ./... + test_rust: + strategy: + matrix: + os: [ubuntu-20.04, ubuntu-22.04] + + runs-on: [self-hosted, '${{ matrix.os }}'] + steps: + - uses: actions/checkout@v4 + + - uses: actions/cache@v3 + with: + path: | + ~/.cargo/bin/ + ~/.cargo/registry/index/ + ~/.cargo/registry/cache/ + ~/.cargo/git/db/ + ./target + key: ${{ matrix.os }}-geyser-plugin-runner-${{ hashFiles('rust-toolchain.toml') }}-${{ hashFiles('**/Cargo.lock') }}-0001 + restore-keys: | + ${{ matrix.os }}-geyser-plugin-runner + + - name: Set rust version + run: | + RUST_VERSION="$(./ci/rust-version.sh)" + echo "RUST_VERSION=$RUST_VERSION" >> "$GITHUB_ENV" + + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ env.RUST_VERSION }} + profile: minimal + components: clippy, rustfmt + + - name: Enter the geyser-plugin-runner directory + run: cd geyser-plugin-runner + + - name: cargo tree + run: | + cargo tree + git checkout Cargo.lock + cargo tree --frozen --offline + + - name: Run fmt + run: cargo fmt --all -- --check + + - name: Run clippy + run: cargo clippy --all-targets --tests -- -Dwarnings + + - name: Run test + run: cargo test --all-targets