From f89932fb8b5c5e85e6a86b2bf4be0403a4667725 Mon Sep 17 00:00:00 2001 From: blockiosaurus Date: Fri, 2 Feb 2024 09:35:31 -0500 Subject: [PATCH] Updating workflows. --- .github/workflows/build-rust-client.yml | 8 +++++++- .github/workflows/main.yml | 25 ------------------------- .github/workflows/publish-js-client.yml | 4 ++-- .github/workflows/test-programs.yml | 2 +- .github/workflows/test-rust-client.yml | 6 ++++++ 5 files changed, 16 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-rust-client.yml b/.github/workflows/build-rust-client.yml index b401a50..b02022f 100644 --- a/.github/workflows/build-rust-client.yml +++ b/.github/workflows/build-rust-client.yml @@ -45,6 +45,12 @@ jobs: version: ${{ inputs.solana || env.SOLANA_VERSION }} cache: ${{ env.CACHE }} + - name: Cache Rust client test dependencies + uses: metaplex-foundation/actions/cache-crate@v1 + with: + folder: ./clients/rust + key: rust-client-test + - name: Run cargo clippy uses: actions-rs/cargo@v1 with: @@ -61,5 +67,5 @@ jobs: with: name: rust-client-builds # First wildcard ensures exported paths are consistently under the clients folder. - path: ./client*/rust/target/release/*mpl_inscription* + path: ./targe*/release/*mpl_inscription* if-no-files-found: error \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2ca7dcf..8a693ec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -97,31 +97,6 @@ jobs: if: env.CACHE == 'true' uses: metaplex-foundation/actions/cache-idl-generators@v1 - - name: Install Linux Build Deps - run: sudo apt-get update && sudo apt-get install -y pkg-config build-essential libudev-dev - - - name: Install Rust - uses: metaplex-foundation/actions/install-rust@v1 - with: - toolchain: ${{ env.RUST_VERSION }} - - - name: Install Solana - uses: metaplex-foundation/actions/install-solana@v1 - with: - version: ${{ env.SOLANA_VERSION }} - cache: ${{ env.CACHE }} - - - name: Cache program dependencies - if: env.CACHE == 'true' - uses: metaplex-foundation/actions/cache-programs@v1 - - - name: Install Node.js - uses: metaplex-foundation/actions/install-node-with-pnpm@v1 - with: - version: ${{ env.NODE_VERSION }} - cache: ${{ env.CACHE }} - dependencies: true - - name: Generate IDLs and clients run: pnpm generate diff --git a/.github/workflows/publish-js-client.yml b/.github/workflows/publish-js-client.yml index 4344fce..b812366 100644 --- a/.github/workflows/publish-js-client.yml +++ b/.github/workflows/publish-js-client.yml @@ -39,7 +39,7 @@ jobs: test_js: name: JS client needs: build_programs - uses: ./.github/workflows/test-js.yml + uses: ./.github/workflows/test-js-client.yml secrets: inherit publish_js: @@ -107,7 +107,7 @@ jobs: deploy_js_docs: name: JS client / Deploy docs runs-on: ubuntu-latest - needs: deploy_js + needs: publish_js environment: name: js-client-documentation url: ${{ steps.deploy.outputs.url }} diff --git a/.github/workflows/test-programs.yml b/.github/workflows/test-programs.yml index 59568c3..d9d24ef 100644 --- a/.github/workflows/test-programs.yml +++ b/.github/workflows/test-programs.yml @@ -45,7 +45,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: fmt - args: --manifest-path ./programs/${{ matrix.program }}/Cargo.toml -- --check + args: --all --manifest-path ./programs/${{ matrix.program }}/Cargo.toml -- --check - name: Run cargo clippy uses: actions-rs/cargo@v1 diff --git a/.github/workflows/test-rust-client.yml b/.github/workflows/test-rust-client.yml index 9e34e2a..28acee2 100644 --- a/.github/workflows/test-rust-client.yml +++ b/.github/workflows/test-rust-client.yml @@ -31,6 +31,12 @@ jobs: version: ${{ env.SOLANA_VERSION }} cache: ${{ env.CACHE }} + - name: Cache Rust client test dependencies + uses: metaplex-foundation/actions/cache-crate@v1 + with: + folder: ./clients/rust + key: rust-client-test + - name: Download program builds uses: actions/download-artifact@v3 with: