Skip to content

Commit 988b3c7

Browse files
agusaldasoroagusaldasoro
authored
Merge branch 'main' into feat/token-pool-v2
2 parents 164acda + 989d6ac commit 988b3c7

File tree

112 files changed

+5092
-4232
lines changed

Some content is hidden

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

112 files changed

+5092
-4232
lines changed

‎.github/workflows/ccip-integration-test.yml‎

Lines changed: 65 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: "Run CCIP OCR3 Integration Test"
22

33
on:
44
pull_request:
5+
merge_group:
56
push:
67
branches:
78
- 'main'
@@ -48,18 +49,24 @@ jobs:
4849
name: "USDC Test"
4950
- cmd: cd integration-tests/smoke/ccip && go test ccip_ooo_execution_test.go -timeout 12m -test.parallel=1 -count=1 -json
5051
name: "OOO Execution Test"
51-
- cmd: cd integration-tests/smoke/ccip && go test -run "Test_CCIPMessaging_EVM2EVM" ccip_messaging_test.go -timeout 12m -test.parallel=2 -count=1 -json
52-
name: "Messaging Test"
52+
- cmd: cd integration-tests/smoke/ccip && go test -run "Test_CCIPMessaging_EVM2EVM" ccip_messaging_test.go -timeout 20m -test.parallel=1 -count=1 -json
53+
name: "Messaging Test Test_CCIPMessaging_EVM2EVM"
54+
- cmd: cd integration-tests/smoke/ccip && go test -run "^Test_CCIPMessaging_EVM2Solana$" ccip_messaging_test.go -timeout 30m -test.parallel=1 -count=1 -json
55+
name: "Messaging Test Test_CCIPMessaging_EVM2Solana"
56+
- cmd: cd integration-tests/smoke/ccip && go test -run "^Test_CCIPMessaging_Solana2EVM$" ccip_messaging_test.go -timeout 30m -test.parallel=1 -count=1 -json
57+
name: "Messaging Test Test_CCIPMessaging_Solana2EVM"
58+
- cmd: cd integration-tests/smoke/ccip && go test -run "^Test_CCIPMessaging_EVM2SolanaMultiExecReports$" ccip_messaging_test.go -timeout 35m -test.parallel=1 -count=1 -json
59+
name: "Messaging Test Test_CCIPMessaging_EVM2SolanaMultiExecReports"
5360
- cmd: cd integration-tests/smoke/ccip && go test -run "Test_CCIPBatching_MaxBatchSizeEVM" ccip_batching_test.go -timeout 12m -test.parallel=1 -count=1 -json
5461
name: "Batching Test Test_CCIPBatching_MaxBatchSizeEVM"
5562
- cmd: cd integration-tests/smoke/ccip && go test -run "^Test_CCIPBatching_MultiSource$" ccip_batching_test.go -timeout 12m -test.parallel=1 -count=1 -json
5663
name: "Batching Test Test_CCIPBatching_MultiSource"
57-
- cmd: cd integration-tests/smoke/ccip && go test -run "Test_CCIPBatching_MultiSource_MultiReports" ccip_batching_test.go -timeout 12m -test.parallel=1 -count=1 -json
58-
name: "Batching Test Test_CCIPBatching_MultiSource_MultiReports"
64+
- cmd: cd integration-tests/smoke/ccip && go test -run "Test_CCIPBatching_MultiSource_MultiRoot" ccip_batching_test.go -timeout 12m -test.parallel=1 -count=1 -json
65+
name: "Batching Test Test_CCIPBatching_MultiSource_MultiRoot"
5966
- cmd: cd integration-tests/smoke/ccip && go test -run "^Test_CCIPBatching_SingleSource$" ccip_batching_test.go -timeout 12m -test.parallel=1 -count=1 -json
6067
name: "Batching Test Test_CCIPBatching_SingleSource"
61-
- cmd: cd integration-tests/smoke/ccip && go test -run "Test_CCIPBatching_SingleSource_MultipleReports" ccip_batching_test.go -timeout 12m -test.parallel=1 -count=1 -json
62-
name: "Batching Test Test_CCIPBatching_SingleSource_MultipleReports"
68+
- cmd: cd integration-tests/smoke/ccip && go test -run "Test_CCIPBatching_SingleSource_MultiRoot" ccip_batching_test.go -timeout 12m -test.parallel=1 -count=1 -json
69+
name: "Batching Test Test_CCIPBatching_SingleSource_MultiRoot"
6370
- cmd: cd integration-tests/smoke/ccip && go test ccip_gas_price_updates_test.go -timeout 12m -test.parallel=2 -count=1 -json
6471
name: "Gas Price Updates Test"
6572
# TODO: this can only run in docker for now, switch to in-memory and uncomment
@@ -85,21 +92,62 @@ jobs:
8592
- name: Fetch latest pull request data
8693
id: fetch_pr_data
8794
uses: actions/github-script@v6
88-
# only run this step if the event is a pull request
89-
if: github.event_name == 'pull_request'
95+
# only run this step if the event is a pull request or merge_group
96+
if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
9097
with:
9198
script: |
92-
const pr = await github.rest.pulls.get({
93-
owner: context.repo.owner,
94-
repo: context.repo.repo,
95-
pull_number: context.issue.number
96-
});
97-
return pr.data.body;
99+
let pull_number;
100+
console.log(`Current eventName: ${context.eventName}`);
101+
if (context.eventName === 'pull_request') {
102+
pull_number = context.issue.number;
103+
console.log(`Event is pull_request, PR number: ${pull_number}`);
104+
} else if (context.eventName === 'merge_group') {
105+
console.log('Event is merge_group. Attempting to get PR number.');
106+
if (context.payload.pull_request && typeof context.payload.pull_request.number === 'number') {
107+
pull_number = context.payload.pull_request.number;
108+
console.log(`Found PR number via context.payload.pull_request.number: ${pull_number}`);
109+
} else {
110+
console.warn('context.payload.pull_request.number is not available or not a number.');
111+
if (context.payload.merge_group && context.payload.merge_group.head_ref) {
112+
const headRef = context.payload.merge_group.head_ref;
113+
console.log(`Attempting to parse PR number from merge_group.head_ref: ${headRef}`);
114+
// Example head_ref: "gh-readonly-queue/main/pr-123-abcdef1234567890" or "pr-123-abcdef" part of a larger string
115+
const match = headRef.match(/pr-(\d+)-[a-fA-F0-9]+/);
116+
if (match && match[1]) {
117+
pull_number = parseInt(match[1], 10);
118+
console.log(`Successfully extracted PR number from head_ref: ${pull_number}`);
119+
} else {
120+
console.error(`Could not extract PR number from head_ref: ${headRef}. Regex match failed.`);
121+
}
122+
} else {
123+
console.error('context.payload.merge_group.head_ref is not available for parsing.');
124+
}
125+
}
126+
127+
if (typeof pull_number !== 'number') {
128+
console.error(`Failed to determine PR number for merge_group event. pull_number is: ${pull_number}`);
129+
// Optionally, you could throw an error here to make the failure explicit:
130+
// throw new Error('Failed to determine PR number for merge_group event.');
131+
}
132+
}
133+
134+
if (typeof pull_number === 'number') {
135+
console.log(`Fetching PR data for PR #${pull_number}`);
136+
const pr = await github.rest.pulls.get({
137+
owner: context.repo.owner,
138+
repo: context.repo.repo,
139+
pull_number: pull_number
140+
});
141+
return pr.data.body;
142+
} else {
143+
console.log('No valid pull request number determined. Skipping PR data fetch, returning empty string.');
144+
return '';
145+
}
98146
- name: Get the chainlink commit sha from PR description, if applicable
99147
id: get_chainlink_sha
100148
run: |
101149
default="develop"
102-
if [ "${{ github.event_name }}" == "pull_request" ]; then
150+
if [ "${{ github.event_name }}" == "pull_request" ] || [ "${{ github.event_name }}" == "merge_group" ]; then
103151
comment=$(cat <<'GREAT_PR_DESCRIPTION_HERE'
104152
${{ steps.fetch_pr_data.outputs.result }}
105153
GREAT_PR_DESCRIPTION_HERE
@@ -127,6 +175,8 @@ jobs:
127175
run: |
128176
if [ "${{ github.event_name }}" == "pull_request" ]; then
129177
COMMIT_SHA=${{ github.event.pull_request.head.sha }}
178+
elif [ "${{ github.event_name }}" == "merge_group" ]; then
179+
COMMIT_SHA=${{ github.event.merge_group.head_sha }}
130180
else
131181
COMMIT_SHA=$(curl -s -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
132182
"https://api.github.com/repos/${{ github.repository }}/commits/${{ github.ref }}" | jq -r .sha)

‎.github/workflows/ccip-ocr3-build-lint-test.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: "Build lint and test CCIP-OCR3"
22

33
on:
44
pull_request:
5+
merge_group:
56
push:
67
branches:
78
- 'main'

‎.github/workflows/codegen.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: "Codegen Verifier"
33

44
on:
55
pull_request:
6+
merge_group:
67
push:
78
branches:
89
- 'main'

0 commit comments

Comments
 (0)