Skip to content

Commit

Permalink
CI: Re-add account-compression sdk to build (#7455)
Browse files Browse the repository at this point in the history
* CI: Re-add account-compression sdk to build

#### Problem

CI is failing because the account-compression sdk was removed from the
pnpm workspace, but the rest of the repo uses pnpm.

#### Summary of changes

Add `account-compression/sdk` back into the workspace, and fix the CI
job to install the correct version of the Solana tools.

* Restrict node version
  • Loading branch information
joncinque authored Nov 4, 2024
1 parent 4374b7d commit f4aee4a
Show file tree
Hide file tree
Showing 7 changed files with 740 additions and 525 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-account-compression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
js-test-account-compression:
runs-on: ubuntu-latest
env:
NODE_VERSION: 20.5
NODE_VERSION: 20.X
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ env.NODE_VERSION }}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/pull-request-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Pull Request JS
on:
pull_request:
paths:
- 'account-compression/sdk/**'
- 'libraries/type-length-value/js/**'
- 'memo/js/**'
- 'name-service/js/**'
Expand All @@ -18,6 +19,7 @@ on:
push:
branches: [master]
paths:
- 'account-compression/sdk/**'
- 'libraries/type-length-value/js/**'
- 'memo/js/**'
- 'single-pool/js/**'
Expand Down Expand Up @@ -49,6 +51,8 @@ jobs:
]
include:
# Restrict certain packages to supported Node.js versions.
- package: account-compression
node-version: 20.x
- package: libraries
node-version: 20.x
- package: single-pool
Expand Down
44 changes: 22 additions & 22 deletions account-compression/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ci/js-test-account-compression.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

set -e
cd "$(dirname "$0")/.."
export SOLANA_VERSION="v2.0.14"
source ./ci/solana-version.sh install

set -x
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"private": true,
"workspaces": [
"account-compression/sdk",
"libraries/type-length-value/js",
"memo/js",
"single-pool/js",
Expand Down
Loading

0 comments on commit f4aee4a

Please sign in to comment.