Skip to content

Commit 31783f2

Browse files
committed
Fix typo and allow override solana version
1 parent 8769b14 commit 31783f2

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

.github/actions/run-tests/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runs:
1515
with:
1616
solana_version: ${{ steps.versions.outputs.solana_version }}
1717
anchor_version: ${{ steps.versions.outputs.anchor_version }}
18-
verify_version: ${{ env.VERIFY_VERSION }}
18+
verify_version: ${{ env.SOLANA_VERIFY_VERSION }}
1919
node_version: 18
2020

2121
- name: Cache node_modules

.github/workflows/reusable-build.yaml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,16 @@ on:
4747
type: string
4848
required: false
4949
default: ""
50+
override-solana-version:
51+
description: "The version is taken from the cargo.lock but you can also override it here"
52+
type: string
53+
required: false
54+
default: ""
55+
override-anchor-version:
56+
description: "The version is taken from the cargo.lock but you can also override it here"
57+
type: string
58+
required: false
59+
default: ""
5060
secrets:
5161
DEVNET_SOLANA_DEPLOY_URL:
5262
MAINNET_SOLANA_DEPLOY_URL:
@@ -119,14 +129,15 @@ jobs:
119129
fi
120130
121131
- uses: Woody4618/solana-github-action-workflow/.github/actions/extract-versions@main
132+
if: inputs.override-solana-version != '' || inputs.override-anchor-version != ''
122133
id: versions
123134

124135
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup-all@main
125136
id: setup
126137
with:
127-
solana_version: ${{ steps.versions.outputs.solana_version }}
128-
anchor_version: ${{ steps.versions.outputs.anchor_version }}
129-
verify_version: ${{ env.VERIFY_VERSION }}
138+
solana_version: ${{ inputs.override-solana-version != '' && inputs.override-solana-version || steps.versions.outputs.solana_version }}
139+
anchor_version: ${{ inputs.override-anchor-version != '' && inputs.override-anchor-version || steps.versions.outputs.anchor_version }}
140+
verify_version: ${{ env.SOLANA_VERIFY_VERSION }}
130141

131142
- name: Set Program Variables from Anchor.toml
132143
if: steps.check-anchor.outputs.is_anchor == 'true'

0 commit comments

Comments
 (0)