Skip to content

Commit

Permalink
Updating workflows.
Browse files Browse the repository at this point in the history
  • Loading branch information
blockiosaurus committed Feb 2, 2024
1 parent f7c8b51 commit f89932f
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 29 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/build-rust-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
25 changes: 0 additions & 25 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-js-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-programs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/test-rust-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit f89932f

Please sign in to comment.