Skip to content

Commit

Permalink
Use hard coded actions path
Browse files Browse the repository at this point in the history
  • Loading branch information
Woody4618 committed Jan 30, 2025
1 parent 4e9c526 commit 62242ae
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 105 deletions.
6 changes: 3 additions & 3 deletions .github/actions/build-verified/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ inputs:
runs:
using: "composite"
steps:
- uses: ./.github/actions/setup/
- uses: ./.github/actions/setup-anchor/
- uses: ./.github/actions/setup-solana-verify/
- uses: Woody4618/github-action/.github/actions/setup/
- uses: Woody4618/github-action/.github/actions/setup-anchor/
- uses: Woody4618/github-action/.github/actions/setup-solana-verify/
with:
verify-version: ${{ inputs.verify-version }}

Expand Down
77 changes: 0 additions & 77 deletions .github/actions/deploy/action.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/actions/idl-upload/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ inputs:
runs:
using: "composite"
steps:
- uses: ./.github/actions/setup/
- uses: ./.github/actions/setup-anchor/
- uses: Woody4618/github-action/.github/actions/setup/
- uses: Woody4618/github-action/.github/actions/setup-anchor/
- run: echo "$DEPLOY_KEYPAIR" > ./deploy-keypair.json && chmod 600 ./deploy-keypair.json
shell: bash
env:
Expand All @@ -42,4 +42,4 @@ runs:
- run: rm ./deploy-keypair.json
shell: bash
if: always()
if: always()
14 changes: 7 additions & 7 deletions .github/actions/program-upgrade/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ inputs:
runs:
using: "composite"
steps:
- uses: ./.github/actions/setup/
- uses: ./.github/actions/setup-solana/
- uses: Woody4618/github-action/.github/actions/setup/
- uses: Woody4618/github-action/.github/actions/setup-solana/

- name: Write keypairs
shell: bash
run: |
Expand Down Expand Up @@ -73,20 +73,20 @@ runs:
echo "Error: No buffer provided"
exit 1
fi
# Get current and new program sizes
CURRENT_SIZE=$(solana program show "${{ inputs.program-id }}" -u "${{ inputs.rpc-url }}" | grep "Data Length:" | cut -d ":" -f2 | cut -d " " -f2)
NEW_SIZE=$(wc -c < "./target/deploy/${{ inputs.program }}.so")
echo "Current program size: $CURRENT_SIZE bytes"
echo "New program size: $NEW_SIZE bytes"
# Extend program if needed
if [ $NEW_SIZE -gt $CURRENT_SIZE ]; then
echo "Program needs to be extended"
solana program extend "${{ inputs.program-id }}" $((NEW_SIZE - CURRENT_SIZE)) -u "${{ inputs.rpc-url }}" -k ./deploy-keypair.json
echo "Program extended successfully"
fi
# Upgrade program
solana program upgrade "${{ inputs.buffer }}" "${{ inputs.program-id }}" -k ./deploy-keypair.json -u "${{ inputs.rpc-url }}"
Expand All @@ -101,4 +101,4 @@ runs:
shell: bash
run: |
rm -f ./deploy-keypair.json
rm -f ./program-keypair.json
rm -f ./program-keypair.json
8 changes: 4 additions & 4 deletions .github/actions/run-tests/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ inputs:
runs:
using: "composite"
steps:
- uses: ./.github/actions/extract-versions/
- uses: Woody4618/github-action/.github/actions/extract-versions/
id: versions

- uses: ./.github/actions/setup/
- uses: Woody4618/github-action/.github/actions/setup/

- uses: ./.github/actions/setup-solana/
- uses: Woody4618/github-action/.github/actions/setup-solana/

- uses: ./.github/actions/setup-anchor/
- uses: Woody4618/github-action/.github/actions/setup-anchor/
with:
anchor-version: ${{ env.ANCHOR_VERSION }}

Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-anchor/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ inputs:
runs:
using: "composite"
steps:
- uses: ./.github/actions/setup/
- uses: ./.github/actions/setup-solana/
- uses: Woody4618/github-action/.github/actions/setup/
- uses: Woody4618/github-action/.github/actions/setup-solana/

- name: Debug Version Values
shell: bash
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/verify-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ inputs:
runs:
using: "composite"
steps:
- uses: ./.github/actions/setup/
- uses: ./.github/actions/setup-solana/
- uses: ./.github/actions/setup-solana-verify/
- uses: Woody4618/github-action/.github/actions/setup/
- uses: Woody4618/github-action/.github/actions/setup-solana/
- uses: Woody4618/github-action/.github/actions/setup-solana-verify/
with:
verify-version: ${{ inputs.verify-version }}

Expand Down
4 changes: 2 additions & 2 deletions .github/actions/write-idl-buffer/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ outputs:
runs:
using: "composite"
steps:
- uses: ./.github/actions/setup/
- uses: ./.github/actions/setup-anchor/
- uses: Woody4618/github-action/.github/actions/setup/
- uses: Woody4618/github-action/.github/actions/setup-anchor/

- name: Write keypair
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/write-program-buffer/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ outputs:
runs:
using: "composite"
steps:
- uses: ./.github/actions/setup/
- uses: ./.github/actions/setup-solana/
- uses: Woody4618/github-action/.github/actions/setup/
- uses: Woody4618/github-action/.github/actions/setup-solana/

- name: Write keypair
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- uses: ./.github/actions/run-tests/
- uses: Woody4618/github-action/.github/actions/run-tests/
with:
program: ${{ github.event.inputs.program }}
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: ./.github/actions/run-tests/
- uses: Woody4618/github-action/.github/actions/run-tests/
with:
program: ${{ github.event.inputs.program }}

0 comments on commit 62242ae

Please sign in to comment.