Skip to content

Commit 50c69c9

Browse files
committed
Update workflows
1 parent 73a511f commit 50c69c9

File tree

2 files changed

+24
-13
lines changed

2 files changed

+24
-13
lines changed

.github/workflows/reusable-build.yaml

Lines changed: 23 additions & 12 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:
@@ -118,15 +128,16 @@ jobs:
118128
echo "MULTISIG_VAULT=${{ secrets.DEVNET_MULTISIG_VAULT }}" >> $GITHUB_ENV
119129
fi
120130
121-
- uses: Woody4618/solana-github-action-workflow/.github/actions/extract-versions@main
131+
- uses: Woody4618/github-actions/.github/actions/extract-versions@main
132+
if: inputs.override-solana-version == '' || inputs.override-anchor-version == ''
122133
id: versions
123134

124-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup-all@main
135+
- uses: Woody4618/github-actions/.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'
@@ -239,14 +250,14 @@ jobs:
239250
fi
240251
241252
- name: Build Anchor
242-
uses: Woody4618/solana-github-action-workflow/.github/actions/build-anchor@main
253+
uses: Woody4618/github-actions/.github/actions/build-anchor@main
243254
if: steps.check-anchor.outputs.is_anchor == 'true'
244255
with:
245256
testing: false
246257
program: ${{ env.PROGRAM_NAME }}
247258

248259
- name: Build Verified
249-
uses: Woody4618/solana-github-action-workflow/.github/actions/build-verified@main
260+
uses: Woody4618/github-actions/.github/actions/build-verified@main
250261
id: build-verified
251262
with:
252263
devnet: ${{ inputs.network == 'devnet' }}
@@ -318,7 +329,7 @@ jobs:
318329
fi
319330
320331
- name: Write Program Buffer
321-
uses: Woody4618/solana-github-action-workflow/.github/actions/write-program-buffer@main
332+
uses: Woody4618/github-actions/.github/actions/write-program-buffer@main
322333
id: program-buffer
323334
if: inputs.deploy
324335
with:
@@ -330,7 +341,7 @@ jobs:
330341
priority-fee: ${{ inputs.priority-fee }}
331342

332343
- name: Write IDL Buffer
333-
uses: Woody4618/solana-github-action-workflow/.github/actions/write-idl-buffer@main
344+
uses: Woody4618/github-actions/.github/actions/write-idl-buffer@main
334345
id: idl-buffer
335346
if: inputs.upload_idl
336347
with:
@@ -341,7 +352,7 @@ jobs:
341352
idl-authority: ${{ inputs.use-squads && env.MULTISIG_VAULT || env.DEPLOYER_ADDRESS }}
342353

343354
- name: Program Upgrade
344-
uses: Woody4618/solana-github-action-workflow/.github/actions/program-upgrade@main
355+
uses: Woody4618/github-actions/.github/actions/program-upgrade@main
345356
if: inputs.deploy && inputs.use-squads == false
346357
with:
347358
program-id: ${{ env.PROGRAM_ID }}
@@ -352,7 +363,7 @@ jobs:
352363
program-keypair: ${{ secrets.PROGRAM_ADDRESS_KEYPAIR }}
353364

354365
- name: IDL Upload
355-
uses: Woody4618/solana-github-action-workflow/.github/actions/idl-upload@main
366+
uses: Woody4618/github-actions/.github/actions/idl-upload@main
356367
if: inputs.upload_idl && inputs.use-squads == false
357368
with:
358369
program-id: ${{ env.PROGRAM_ID }}
@@ -361,7 +372,7 @@ jobs:
361372
idl-buffer: ${{ steps.idl-buffer.outputs.buffer }}
362373

363374
- name: Verify Build
364-
uses: Woody4618/solana-github-action-workflow/.github/actions/verify-build@main
375+
uses: Woody4618/github-actions/.github/actions/verify-build@main
365376
id: verify-build
366377
if: inputs.verify
367378
with:

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121

22-
- uses: Woody4618/solana-github-action-workflow/.github/actions/run-tests@main
22+
- uses: Woody4618/github-actions/.github/actions/run-tests@main
2323
with:
2424
program: ${{ inputs.program }}

0 commit comments

Comments
 (0)