Skip to content

Commit 319d88b

Browse files
committed
git merge develop
2 parents 2155ebf + 7c432e1 commit 319d88b

File tree

19 files changed

+37
-30
lines changed

19 files changed

+37
-30
lines changed

.changeset/ninety-mirrors-sleep.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"chainlink": patch
3+
---
4+
5+
#updated chain selectors

.github/workflows/ci-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ jobs:
361361
token: ${{ secrets.QA_SLACK_API_KEY }}
362362
payload: |
363363
channel: ${{ secrets.SLACK_TOPIC_DATA_RACES_CHANNEL_ID}}
364-
text: "Race Tests Failed: <${{ format('https://github.com/{0}/actions/runs/{1}/jobs/{2}', github.repository, github.run_id, job.check_run_id) }}|Run>"
364+
text: "Race Tests Failed: <${{ format('https://github.com/{0}/actions/runs/{1}/job/{2}', github.repository, github.run_id, job.check_run_id) }}|Run>"
365365
366366
core-scripts-tests:
367367
name: test-scripts

.github/workflows/codeql.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,20 @@ jobs:
3131
- language: go
3232
build-mode: manual
3333
runs-on: ${{ needs.runner-config.outputs.go-runner }}
34-
is-self-hosted: ${{ needs.runner-config.outputs.go-is-self-hosted }}
3534

3635
- language: javascript-typescript
3736
build-mode: none
37+
codeql-config: |
38+
paths-ignore:
39+
- 'core/web/assets'
40+
- '**/node_modules/**'
3841
3942
- language: python
4043
build-mode: none
4144
steps:
4245
- name: Enable S3 Cache for Self-Hosted Runners
43-
if: matrix.is-self-hosted == 'true'
46+
# these env vars are set (and exposed) when it is a self-hosted runner with extras=s3-cache
47+
if: ${{ env.RUNS_ON_INSTANCE_ID != '' && env.ACTIONS_CACHE_URL != '' }}
4448
uses: runs-on/action@66d4449b717b5462159659523d1241051ff470b9 # v1
4549

4650
- name: Checkout repository
@@ -63,6 +67,7 @@ jobs:
6367
with:
6468
languages: ${{ matrix.language }}
6569
build-mode: ${{ matrix.build-mode }}
70+
config: ${{ matrix.codeql-config || '' }}
6671
# If you wish to specify custom queries, you can do so here or in a config file.
6772
# By default, queries listed here will override any specified in a config file.
6873
# Prefix the list here with "+" to use these queries and those in the config file.
@@ -92,8 +97,6 @@ jobs:
9297
SH_GO_RUNNER: runs-on=${{ github.run_id }}/cpu=32/ram=64/family=c6i/spot=false/extras=s3-cache+tmpfs
9398
GH_GO_RUNNER: ubuntu24.04-8cores-32GB
9499
outputs:
95-
# go codeql runner
96-
go-is-self-hosted: ${{ steps.go-codeql.outputs.go-is-self-hosted }}
97100
go-runner: ${{ steps.go-codeql.outputs.go-runner }}
98101
steps:
99102
- name: Get PR Labels
@@ -110,7 +113,6 @@ jobs:
110113
run: |
111114
if [[ "$OPT_OUT" == "true" ]]; then
112115
echo "Opt-out is true for current run. Using gh-hosted runner for Go codeql."
113-
echo "go-is-self-hosted=false" | tee -a $GITHUB_OUTPUT
114116
echo "go-runner=${GH_GO_RUNNER}" | tee -a $GITHUB_OUTPUT
115117
exit 0
116118
fi

.github/workflows/cre-regression-system-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ jobs:
192192
-- \
193193
-v -run "^(${TEST_NAME})$" -timeout ${TEST_TIMEOUT} -count=1 -parallel=1 \
194194
github.com/smartcontractkit/chainlink/system-tests/tests/regression/cre
195-
195+
196196
exit_code=$?
197197
if [ $exit_code -eq 0 ]; then
198198
echo "tests_result=✅ Tests passed" >> $GITHUB_OUTPUT
@@ -207,7 +207,7 @@ jobs:
207207
trunk-org-slug: chainlink
208208
trunk-token: ${{ secrets.TRUNK_API_KEY }}
209209
trunk-previous-step-outcome: ${{ steps.run-regression-tests.outcome }}
210-
trunk-job-url: ${{ format('https://github.com/{0}/actions/runs/{1}/jobs/{2}', github.repository, github.run_id, job.check_run_id) }}
210+
trunk-job-url: ${{ format('https://github.com/{0}/actions/runs/{1}/job/{2}', github.repository, github.run_id, job.check_run_id) }}
211211
# when auto-quarantine is enabled, allow this to determine test failures
212212
trunk-upload-only: ${{ env.ENABLE_AUTO_QUARANTINE != 'true' }}
213213

.github/workflows/cre-system-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ jobs:
253253
trunk-org-slug: chainlink
254254
trunk-token: ${{ secrets.TRUNK_API_KEY }}
255255
trunk-previous-step-outcome: ${{ steps.run-tests.outcome }}
256-
trunk-job-url: ${{ format('https://github.com/{0}/actions/runs/{1}/jobs/{2}', github.repository, github.run_id, job.check_run_id) }}
256+
trunk-job-url: ${{ format('https://github.com/{0}/actions/runs/{1}/job/{2}', github.repository, github.run_id, job.check_run_id) }}
257257
# when auto-quarantine is enabled, allow this to determine test failures
258258
trunk-upload-only: ${{ env.ENABLE_AUTO_QUARANTINE != 'true' }}
259259

core/scripts/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ require (
475475
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
476476
github.com/smartcontractkit/ccip-contract-examples/chains/evm v0.0.0-20250826190403-aed7f5f33cde // indirect
477477
github.com/smartcontractkit/ccip-owner-contracts v0.1.0 // indirect
478-
github.com/smartcontractkit/chain-selectors v1.0.71 // indirect
478+
github.com/smartcontractkit/chain-selectors v1.0.72 // indirect
479479
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250916164650-970686360fbf // indirect
480480
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8184001834b5 // indirect
481481
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5 // indirect

core/scripts/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,8 +1585,8 @@ github.com/smartcontractkit/ccip-contract-examples/chains/evm v0.0.0-20250826190
15851585
github.com/smartcontractkit/ccip-contract-examples/chains/evm v0.0.0-20250826190403-aed7f5f33cde/go.mod h1:SYc+BvAALmwsx2zMJIAczIyVNwsiXRIBXmejcTORxGE=
15861586
github.com/smartcontractkit/ccip-owner-contracts v0.1.0 h1:GiBDtlx7539o7AKlDV+9LsA7vTMPv+0n7ClhSFnZFAk=
15871587
github.com/smartcontractkit/ccip-owner-contracts v0.1.0/go.mod h1:NnT6w4Kj42OFFXhSx99LvJZWPpMjmo4+CpDEWfw61xY=
1588-
github.com/smartcontractkit/chain-selectors v1.0.71 h1:5DY50sdoUuBkA2FAOmxXbdzl43Ooy04wFwQW5gs/Bjo=
1589-
github.com/smartcontractkit/chain-selectors v1.0.71/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
1588+
github.com/smartcontractkit/chain-selectors v1.0.72 h1:AExF2H3mABdLCN0QZd+IjU8CkblTZLKJqvp4vcwew+g=
1589+
github.com/smartcontractkit/chain-selectors v1.0.72/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
15901590
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250916164650-970686360fbf h1:BWu2DxWj9I3Gl7gRgtxSdtqc6Z3NjKJE6q5OhGCiiEA=
15911591
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250916164650-970686360fbf/go.mod h1:tEjqontct1/5cKHm4q75nopZa1rwzaQZwd9U9wn0uZE=
15921592
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=

deployment/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ require (
3434
github.com/sethvargo/go-retry v0.2.4
3535
github.com/smartcontractkit/ccip-contract-examples/chains/evm v0.0.0-20250826190403-aed7f5f33cde
3636
github.com/smartcontractkit/ccip-owner-contracts v0.1.0
37-
github.com/smartcontractkit/chain-selectors v1.0.71
37+
github.com/smartcontractkit/chain-selectors v1.0.72
3838
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250916164650-970686360fbf
3939
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250924235336-59224fdb487a
4040
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8184001834b5

deployment/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,8 +1322,8 @@ github.com/smartcontractkit/ccip-contract-examples/chains/evm v0.0.0-20250826190
13221322
github.com/smartcontractkit/ccip-contract-examples/chains/evm v0.0.0-20250826190403-aed7f5f33cde/go.mod h1:SYc+BvAALmwsx2zMJIAczIyVNwsiXRIBXmejcTORxGE=
13231323
github.com/smartcontractkit/ccip-owner-contracts v0.1.0 h1:GiBDtlx7539o7AKlDV+9LsA7vTMPv+0n7ClhSFnZFAk=
13241324
github.com/smartcontractkit/ccip-owner-contracts v0.1.0/go.mod h1:NnT6w4Kj42OFFXhSx99LvJZWPpMjmo4+CpDEWfw61xY=
1325-
github.com/smartcontractkit/chain-selectors v1.0.71 h1:5DY50sdoUuBkA2FAOmxXbdzl43Ooy04wFwQW5gs/Bjo=
1326-
github.com/smartcontractkit/chain-selectors v1.0.71/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
1325+
github.com/smartcontractkit/chain-selectors v1.0.72 h1:AExF2H3mABdLCN0QZd+IjU8CkblTZLKJqvp4vcwew+g=
1326+
github.com/smartcontractkit/chain-selectors v1.0.72/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
13271327
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250916164650-970686360fbf h1:BWu2DxWj9I3Gl7gRgtxSdtqc6Z3NjKJE6q5OhGCiiEA=
13281328
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250916164650-970686360fbf/go.mod h1:tEjqontct1/5cKHm4q75nopZa1rwzaQZwd9U9wn0uZE=
13291329
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ require (
7878
github.com/shirou/gopsutil/v3 v3.24.3
7979
github.com/shopspring/decimal v1.4.0
8080
github.com/sigurn/crc16 v0.0.0-20211026045750-20ab5afb07e3
81-
github.com/smartcontractkit/chain-selectors v1.0.70
81+
github.com/smartcontractkit/chain-selectors v1.0.72
8282
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250916164650-970686360fbf
8383
github.com/smartcontractkit/chainlink-automation v0.8.1
8484
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250924235336-59224fdb487a

0 commit comments

Comments
 (0)