Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ inputs:
description: 'Install surfpool (only needed for integration tests)'
required: false
default: 'false'
surfpool-version:
description: "Surfpool CLI version to install (e.g., '1.2.1')"
required: false
default: '1.2.1'
install-solana:
description: 'Install Solana CLI'
required: false
Expand Down Expand Up @@ -119,15 +123,33 @@ runs:
shell: bash
run: pnpm install --frozen-lockfile

- name: Resolve Surfpool release
if: inputs.install-surfpool == 'true'
id: surfpool-release
shell: bash
run: |
version='${{ inputs.surfpool-version }}'
if [[ "$version" =~ ^[0-9] ]]; then
version="v$version"
fi
echo "version=$version" >> "$GITHUB_OUTPUT"
- name: Cache surfpool
if: inputs.install-surfpool == 'true'
id: surfpool-cache
uses: actions/cache@v4
with:
path: ~/.local/bin/surfpool
key: ${{ runner.os }}-surfpool-v1
key: ${{ runner.os }}-surfpool-${{ steps.surfpool-release.outputs.version }}

- name: Install surfpool
if: inputs.install-surfpool == 'true' && steps.surfpool-cache.outputs.cache-hit != 'true'
shell: bash
env:
VERSION: ${{ steps.surfpool-release.outputs.version }}
run: curl -sL https://run.surfpool.run/ | bash

- name: Verify surfpool
if: inputs.install-surfpool == 'true'
shell: bash
run: surfpool --version
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ permissions:

env:
SOLANA_VERSION: '4.0.0'
SURFPOOL_VERSION: '1.2.1'

jobs:
unit-test:
Expand Down Expand Up @@ -64,6 +65,7 @@ jobs:
install-surfpool: 'true'
rust-cache-key: 'typescript-integration-test'
solana-version: ${{ env.SOLANA_VERSION }}
surfpool-version: ${{ env.SURFPOOL_VERSION }}

- name: Run TypeScript integration tests
run: just test-client
Expand Down
Loading
Loading