Skip to content

Commit 9969377

Browse files
committed
Add squads vault index
1 parent 2861c2b commit 9969377

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

.github/actions/write-program-buffer/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ runs:
9393
if: steps.check-program.outputs.exists == 'true'
9494
uses: nick-invision/retry@v2
9595
with:
96-
timeout_minutes: 30
96+
timeout_minutes: 60
9797
max_attempts: 3
9898
shell: bash
9999
command: |

.github/workflows/reusable-build.yaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ on:
3737
required: false
3838
type: string
3939
default: "100000"
40+
vault-index:
41+
description: "Index of the vault to use for the multisig"
42+
required: false
43+
type: string
44+
default: "0"
4045
secrets:
4146
DEVNET_SOLANA_DEPLOY_URL:
4247
MAINNET_SOLANA_DEPLOY_URL:
@@ -69,6 +74,12 @@ jobs:
6974
- name: Checkout repository
7075
uses: actions/checkout@v4
7176

77+
- name: Validate network
78+
if: inputs.network != 'devnet' && inputs.network != 'mainnet'
79+
run: |
80+
echo "Error: network must be either 'devnet' or 'mainnet'"
81+
exit 1
82+
7283
- name: Set deployment variables
7384
run: |
7485
# Network specific variables
@@ -274,7 +285,7 @@ jobs:
274285
use-squads: ${{ inputs.use-squads }}
275286
vault-address: ${{ env.MULTISIG_VAULT }}
276287

277-
- name: Deploy Program (Squads)
288+
- name: Create squads program upgrade transaction (set Idl buffer, verify pda, set program buffer)
278289
if: inputs.deploy && inputs.use-squads
279290
uses: Woody4618/squads-program-action@main
280291
with:
@@ -284,4 +295,6 @@ jobs:
284295
idl-buffer: ${{ steps.idl-buffer.outputs.buffer }}
285296
multisig: ${{ env.MULTISIG }}
286297
keypair: ${{ env.DEPLOYER_KEYPAIR }}
298+
priority-fee: ${{ inputs.priority-fee }}
299+
vault-index: ${{ inputs.vault-index }}
287300
pda-tx: ${{ steps.verify-build.outputs.pda_tx }}

0 commit comments

Comments
 (0)