@@ -118,24 +118,15 @@ jobs:
118118 echo "MULTISIG_VAULT=${{ secrets.DEVNET_MULTISIG_VAULT }}" >> $GITHUB_ENV
119119 fi
120120
121- - name : Extract Versions
122- uses : Woody4618/solana-github-action-workflow/.github/actions/extract- versions@main
121+ - uses : Woody4618/solana-github-action-workflow/.github/actions/extract-versions@main
122+ id : versions
123123
124- - name : Setup Environment
125- uses : Woody4618/solana-github-action-workflow/.github/actions/setup@main
126-
127- - name : Debug Environment Before Setup
128- run : |
129- echo "=== Environment Variables Before Setup ==="
130- env | grep -E "SOLANA|ANCHOR"
131- echo "==========================="
132-
133- - name : Install Solana
134- uses : Woody4618/solana-github-action-workflow/.github/actions/setup-solana@main
135-
136- - name : Install Anchor
137- uses : Woody4618/solana-github-action-workflow/.github/actions/setup-anchor@main
138- if : steps.check-anchor.outputs.is_anchor == 'true'
124+ - uses : Woody4618/solana-github-action-workflow/.github/actions/setup-all@main
125+ id : setup
126+ with :
127+ solana_version : ${{ steps.versions.outputs.solana_version }}
128+ anchor_version : ${{ steps.versions.outputs.anchor_version }}
129+ verify_version : ${{ env.VERIFY_VERSION }}
139130
140131 - name : Set Program Variables from Anchor.toml
141132 if : steps.check-anchor.outputs.is_anchor == 'true'
@@ -258,7 +249,6 @@ jobs:
258249 uses : Woody4618/solana-github-action-workflow/.github/actions/build-verified@main
259250 id : build-verified
260251 with :
261- verify-version : ${{ env.SOLANA_VERIFY_VERSION }}
262252 devnet : ${{ inputs.network == 'devnet' }}
263253 program : ${{ env.PROGRAM_NAME }}
264254 program-id : ${{ env.PROGRAM_ID }}
@@ -375,7 +365,6 @@ jobs:
375365 id : verify-build
376366 if : inputs.verify
377367 with :
378- verify-version : ${{ env.SOLANA_VERIFY_VERSION }}
379368 program-id : ${{ env.PROGRAM_ID }}
380369 program : ${{ env.PROGRAM_NAME }}
381370 network : ${{ inputs.network }}
0 commit comments