Skip to content

Commit f735b0e

Browse files
committed
Remove interdependencies all all actions
1 parent 144a48c commit f735b0e

File tree

9 files changed

+8
-53
lines changed

9 files changed

+8
-53
lines changed

.github/actions/build-anchor/action.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ inputs:
1111
runs:
1212
using: "composite"
1313
steps:
14-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup@main
15-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup-solana@main
16-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup-anchor@main
1714
- name: Build Program
1815
shell: bash
1916
run: |

.github/actions/build-verified/action.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ inputs:
1515
program-id:
1616
description: "The program id of the program we are uploading"
1717
required: true
18-
verify-version:
19-
description: "Version of solana-verify to use"
20-
required: true
2118
features:
2219
description: "Features to enable during build"
2320
required: false
@@ -26,11 +23,6 @@ inputs:
2623
runs:
2724
using: "composite"
2825
steps:
29-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup@main
30-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup-solana-verify@main
31-
with:
32-
verify-version: ${{ inputs.verify-version }}
33-
3426
# Add Docker socket mounting
3527
- name: Setup Docker
3628
shell: bash

.github/actions/idl-upload/action.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ inputs:
1717
runs:
1818
using: "composite"
1919
steps:
20-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup@main
21-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup-anchor@main
2220
- run: echo "$DEPLOY_KEYPAIR" > ./deploy-keypair.json && chmod 600 ./deploy-keypair.json
2321
shell: bash
2422
env:

.github/actions/program-upgrade/action.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ inputs:
2323
runs:
2424
using: "composite"
2525
steps:
26-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup@main
27-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup-solana@main
28-
2926
- name: Write keypairs
3027
shell: bash
3128
run: |

.github/actions/setup-anchor/action.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ inputs:
88
runs:
99
using: "composite"
1010
steps:
11-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup@main
12-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup-solana@main
13-
1411
- name: Debug Version Values
1512
shell: bash
1613
run: |

.github/actions/verify-build/action.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ inputs:
3333
network:
3434
description: "Target network (mainnet/devnet)"
3535
required: true
36-
verify-version:
37-
description: "Version of solana-verify to use"
38-
required: true
3936
use-squads:
4037
description: "Whether to use Squads for deployment"
4138
required: false
@@ -47,12 +44,6 @@ inputs:
4744
runs:
4845
using: "composite"
4946
steps:
50-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup@main
51-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup-solana@main
52-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup-solana-verify@main
53-
with:
54-
verify-version: ${{ inputs.verify-version }}
55-
5647
- name: Write keypair
5748
shell: bash
5849
run: |

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ outputs:
2525
runs:
2626
using: "composite"
2727
steps:
28-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup@main
29-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup-anchor@main
30-
3128
- name: Write keypair
3229
shell: bash
3330
run: echo "$DEPLOY_KEYPAIR" > ./deploy-keypair.json && chmod 600 ./deploy-keypair.json

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ outputs:
2929
runs:
3030
using: "composite"
3131
steps:
32-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup@main
33-
- uses: Woody4618/solana-github-action-workflow/.github/actions/setup-solana@main
34-
3532
- name: Write keypair
3633
shell: bash
3734
run: echo "$DEPLOY_KEYPAIR" > ./deploy-keypair.json && chmod 600 ./deploy-keypair.json

.github/workflows/reusable-build.yaml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -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

Comments
 (0)