Skip to content

Commit c4e86de

Browse files
Perelyn-samaPerelyn-sama
authored
Merge branch 'solana-developers:main' into pino/checking-account
2 parents e0d9c85 + b72c92f commit c4e86de

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2126
-94
lines changed

‎.github/workflows/solana-pinocchio.yml‎

Lines changed: 268 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,268 @@
1+
name: Pinocchio
2+
3+
on:
4+
schedule:
5+
- cron: "0 0 * * *"
6+
push:
7+
branches:
8+
- main
9+
pull_request:
10+
types: [opened, synchronize, reopened]
11+
branches:
12+
- main
13+
14+
env:
15+
MAX_JOBS: 64
16+
MIN_PROJECTS_PER_JOB: 4
17+
MIN_PROJECTS_FOR_MATRIX: 4
18+
19+
jobs:
20+
changes:
21+
runs-on: ubuntu-latest
22+
permissions:
23+
pull-requests: read
24+
outputs:
25+
changed_projects: ${{ steps.analyze.outputs.changed_projects }}
26+
total_projects: ${{ steps.analyze.outputs.total_projects }}
27+
matrix: ${{ steps.matrix.outputs.matrix }}
28+
steps:
29+
- uses: actions/checkout@v4
30+
- uses: dorny/paths-filter@v3
31+
id: changes
32+
if: github.event_name == 'pull_request'
33+
with:
34+
list-files: shell
35+
filters: |
36+
pinocchio:
37+
- added|modified: '**/pinocchio/**'
38+
workflow:
39+
- added|modified: '.github/workflows/solana-pinocchio.yml'
40+
- name: Analyze Changes
41+
id: analyze
42+
run: |
43+
# Generate ignore pattern, excluding comments
44+
ignore_pattern=$(grep -v '^#' .github/.ghaignore | grep -v '^$' | tr '\n' '|' | sed 's/|$//')
45+
echo "Ignore pattern: $ignore_pattern"
46+
47+
function get_projects() {
48+
find . -type d -name "pinocchio" | grep -vE "$ignore_pattern" | sort
49+
}
50+
51+
# Determine which projects to build and test
52+
if [[ "${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "schedule" || "${{ steps.changes.outputs.workflow }}" == "true" ]]; then
53+
projects=$(get_projects)
54+
elif [[ "${{ steps.changes.outputs.pinocchio }}" == "true" ]]; then
55+
changed_files=(${{ steps.changes.outputs.pinocchio_files }})
56+
projects=$(for file in "${changed_files[@]}"; do dirname "${file}" | grep pinocchio | sed 's#/pinocchio/.*#/pinocchio#g'; done | grep -vE "$ignore_pattern" | sort -u)
57+
else
58+
projects=""
59+
fi
60+
61+
# Output project information
62+
if [[ -n "$projects" ]]; then
63+
echo "Projects to build and test"
64+
echo "$projects"
65+
total_projects=$(echo "$projects" | wc -l)
66+
echo "Total projects: $total_projects"
67+
echo "total_projects=$total_projects" >> $GITHUB_OUTPUT
68+
echo "changed_projects=$(echo "$projects" | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
69+
else
70+
echo "No projects to build and test."
71+
echo "total_projects=0" >> $GITHUB_OUTPUT
72+
echo "changed_projects=[]" >> $GITHUB_OUTPUT
73+
fi
74+
- name: Generate matrix
75+
id: matrix
76+
run: |
77+
total_projects=${{ steps.analyze.outputs.total_projects }}
78+
max_jobs=${{ env.MAX_JOBS }}
79+
min_projects_per_job=${{ env.MIN_PROJECTS_PER_JOB }}
80+
min_projects_for_matrix=${{ env.MIN_PROJECTS_FOR_MATRIX }}
81+
82+
if [ "$total_projects" -lt "$min_projects_for_matrix" ]; then
83+
echo "matrix=[0]" >> $GITHUB_OUTPUT
84+
else
85+
projects_per_job=$(( (total_projects + max_jobs - 1) / max_jobs ))
86+
projects_per_job=$(( projects_per_job > min_projects_per_job ? projects_per_job : min_projects_per_job ))
87+
num_jobs=$(( (total_projects + projects_per_job - 1) / projects_per_job ))
88+
89+
indices=$(seq 0 $(( num_jobs - 1 )))
90+
echo "matrix=[$(echo $indices | tr ' ' ',')]" >> $GITHUB_OUTPUT
91+
fi
92+
93+
build-and-test:
94+
needs: changes
95+
if: needs.changes.outputs.total_projects != '0'
96+
runs-on: ubuntu-latest
97+
strategy:
98+
fail-fast: false
99+
matrix:
100+
index: ${{ fromJson(needs.changes.outputs.matrix) }}
101+
name: build-and-test-group-${{ matrix.index }}
102+
outputs:
103+
failed_projects: ${{ steps.set-failed.outputs.failed_projects }}
104+
steps:
105+
- uses: actions/checkout@v4
106+
- name: Use Node.js
107+
uses: actions/setup-node@v4
108+
with:
109+
node-version: "lts/*"
110+
check-latest: true
111+
- name: Setup build environment
112+
id: setup
113+
run: |
114+
# Create the build and test function
115+
cat << 'EOF' > build_and_test.sh
116+
function build_and_test() {
117+
local project=$1
118+
local solana_version=$2
119+
echo "Building and Testing $project with Solana $solana_version"
120+
cd "$project" || return 1
121+
122+
# Install dependencies
123+
if ! pnpm install --frozen-lockfile; then
124+
echo "::error::pnpm install failed for $project"
125+
echo "$project: pnpm install failed with $solana_version" >> $GITHUB_WORKSPACE/failed_projects.txt
126+
cd - > /dev/null
127+
return 1
128+
fi
129+
130+
# Build
131+
if ! pnpm build; then
132+
echo "::error::build failed for $project"
133+
echo "$project: build failed with $solana_version" >> $GITHUB_WORKSPACE/failed_projects.txt
134+
cd - > /dev/null
135+
return 1
136+
fi
137+
138+
# Test
139+
if ! pnpm build-and-test; then
140+
echo "::error::tests failed for $project"
141+
echo "$project: tests failed with $solana_version" >> $GITHUB_WORKSPACE/failed_projects.txt
142+
cd - > /dev/null
143+
return 1
144+
fi
145+
146+
# Run Rust unit tests
147+
if [ -d "program" ]; then
148+
echo "Running Rust unit tests for $project"
149+
if ! cargo test --manifest-path=./program/Cargo.toml; then
150+
echo "::error::Rust unit tests failed for $project"
151+
echo "$project: Rust unit tests failed with $solana_version" >> $GITHUB_WORKSPACE/failed_projects.txt
152+
cd - > /dev/null
153+
return 1
154+
fi
155+
fi
156+
157+
echo "Build and tests succeeded for $project with $solana_version version."
158+
cd - > /dev/null
159+
return 0
160+
}
161+
162+
function process_projects() {
163+
local solana_version=$1
164+
165+
readarray -t all_projects < <(echo '${{ needs.changes.outputs.changed_projects }}' | jq -r '.[]?')
166+
start_index=$(( ${{ matrix.index }} * ${{ env.MIN_PROJECTS_PER_JOB }} ))
167+
end_index=$(( start_index + ${{ env.MIN_PROJECTS_PER_JOB }} ))
168+
end_index=$(( end_index > ${{ needs.changes.outputs.total_projects }} ? ${{ needs.changes.outputs.total_projects }} : end_index ))
169+
170+
echo "Projects to build and test in this job"
171+
for i in $(seq $start_index $(( end_index - 1 ))); do
172+
echo "${all_projects[$i]}"
173+
done
174+
175+
failed=false
176+
for i in $(seq $start_index $(( end_index - 1 ))); do
177+
echo "::group::Building and testing ${all_projects[$i]}"
178+
if ! build_and_test "${all_projects[$i]}" "$solana_version"; then
179+
failed=true
180+
fi
181+
echo "::endgroup::"
182+
done
183+
184+
return $([ "$failed" = true ] && echo 1 || echo 0)
185+
}
186+
EOF
187+
188+
# Make the script executable
189+
chmod +x build_and_test.sh
190+
191+
# Install pnpm
192+
npm install --global pnpm
193+
- name: Setup Solana Stable
194+
uses: heyAyushh/[email protected]
195+
with:
196+
solana-cli-version: stable
197+
- name: Build and Test with Stable
198+
run: |
199+
source build_and_test.sh
200+
solana -V
201+
rustc -V
202+
process_projects "stable"
203+
- name: Setup Solana Beta
204+
uses: heyAyushh/[email protected]
205+
with:
206+
solana-cli-version: beta
207+
- name: Build and Test with Beta
208+
continue-on-error: true
209+
run: |
210+
source build_and_test.sh
211+
solana -V
212+
rustc -V
213+
process_projects "beta"
214+
215+
- name: Set failed projects output
216+
id: set-failed
217+
if: failure()
218+
run: |
219+
if [ -f "$GITHUB_WORKSPACE/failed_projects.txt" ]; then
220+
failed_projects=$(cat $GITHUB_WORKSPACE/failed_projects.txt | jq -R -s -c 'split("\n")[:-1]')
221+
echo "failed_projects=$failed_projects" >> $GITHUB_OUTPUT
222+
else
223+
echo "failed_projects=[]" >> $GITHUB_OUTPUT
224+
fi
225+
226+
summary:
227+
needs: [changes, build-and-test]
228+
if: always()
229+
runs-on: ubuntu-latest
230+
steps:
231+
- uses: actions/checkout@v4
232+
- name: Create job summary
233+
run: |
234+
echo "## Pinocchio Workflow Summary" >> $GITHUB_STEP_SUMMARY
235+
echo "- Total projects: ${{ needs.changes.outputs.total_projects }}" >> $GITHUB_STEP_SUMMARY
236+
237+
# List all processed projects
238+
echo "<details>" >> $GITHUB_STEP_SUMMARY
239+
echo "<summary>Projects processed (click to expand)</summary>" >> $GITHUB_STEP_SUMMARY
240+
echo "" >> $GITHUB_STEP_SUMMARY
241+
echo '${{ needs.changes.outputs.changed_projects }}' | jq -r '.[]' | while read project; do
242+
echo "- $project" >> $GITHUB_STEP_SUMMARY
243+
done
244+
echo "" >> $GITHUB_STEP_SUMMARY
245+
echo "</details>" >> $GITHUB_STEP_SUMMARY
246+
247+
# Report build and test results
248+
if [[ "${{ needs.build-and-test.result }}" == "failure" ]]; then
249+
echo "## :x: Build or tests failed" >> $GITHUB_STEP_SUMMARY
250+
echo "<details>" >> $GITHUB_STEP_SUMMARY
251+
echo "<summary>Failed projects (click to expand)</summary>" >> $GITHUB_STEP_SUMMARY
252+
echo "" >> $GITHUB_STEP_SUMMARY
253+
failed_projects='${{ needs.build-and-test.outputs.failed_projects }}'
254+
if [[ -n "$failed_projects" ]]; then
255+
echo "$failed_projects" | jq -r '.[]' | while IFS=: read -r project failure_reason; do
256+
echo "- **$project**" >> $GITHUB_STEP_SUMMARY
257+
echo " - Failure reason: $failure_reason" >> $GITHUB_STEP_SUMMARY
258+
done
259+
else
260+
echo "No failed projects reported. This might indicate an unexpected error in the workflow." >> $GITHUB_STEP_SUMMARY
261+
fi
262+
echo "" >> $GITHUB_STEP_SUMMARY
263+
echo "</details>" >> $GITHUB_STEP_SUMMARY
264+
elif [[ "${{ needs.build-and-test.result }}" == "success" ]]; then
265+
echo "## :white_check_mark: All builds and tests passed" >> $GITHUB_STEP_SUMMARY
266+
else
267+
echo "## :warning: Build and test job was skipped or canceled" >> $GITHUB_STEP_SUMMARY
268+
fi

‎Cargo.lock‎

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
members = [
33
#basics
44
"basics/account-data/native/program",
5+
"basics/account-data/pinocchio/program",
56
"basics/account-data/anchor/programs/anchor-program-example",
67
"basics/checking-accounts/native/program",
78
"basics/checking-accounts/pinocchio/program",

‎basics/account-data/pinocchio/cicd.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
3+
# This script is for quick building & deploying of the program.
4+
# It also serves as a reference for the commands used for building & deploying Solana programs.
5+
# Run this bad boy with "bash cicd.sh" or "./cicd.sh"
6+
7+
cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
8+
solana program deploy ./program/target/so/program.so

‎basics/account-data/pinocchio/package.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"type": "module",
3+
"scripts": {
4+
"test": "pnpm ts-mocha -p ./tsconfig.json -t 1000000 ./tests/index.test.ts",
5+
"build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
6+
"build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
7+
"deploy": "solana program deploy ./program/target/so/hello_solana_program_pinocchio.so"
8+
},
9+
"dependencies": {
10+
"@solana/web3.js": "^1.47.3"
11+
},
12+
"devDependencies": {
13+
"@types/bn.js": "^5.1.0",
14+
"@types/chai": "^4.3.1",
15+
"@types/mocha": "^9.1.1",
16+
"@types/node": "^22.15.2",
17+
"chai": "^4.3.4",
18+
"mocha": "^9.0.3",
19+
"solana-bankrun": "^0.3.0",
20+
"ts-mocha": "^10.0.0",
21+
"typescript": "^4.3.5"
22+
}
23+
}

0 commit comments

Comments
 (0)