Skip to content

Commit df196e1

Browse files
gheorghestrimtugheorghestrimtu
committed
Merge branch 'develop' of github.com:smartcontractkit/chainlink into rane-4184-rane-4339-feat/node-platform-build-info-event
# Conflicts: # .github/workflows/client-compatibility-tests.yml
2 parents 43ce2c5 + 3a94bde commit df196e1

92 files changed

Lines changed: 1903 additions & 788 deletions

File tree

Some content is hidden

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

‎.changeset/sour-sharks-aid.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+
#added Emit gas-related metrics through Beholder

‎.github/copilot-instructions.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,11 @@ Identify specific code blocks that require **scrupulous human review**. Focus on
1818
Analyze the `CODEOWNERS` file and the git history (recent editors) to suggest the most qualified reviewers.
1919
- Prioritize individuals who have made significant recent contributions to the specific files modified.
2020
- Cross-reference these contributors with the defined `CODEOWNERS` for the directory.
21+
22+
### 4. Code Style
23+
Give style advice based on the following guides, in order of priority.
24+
1. [Effective Go](https://go.dev/doc/effective_go)
25+
2. [Google Code Review Comments](https://go.dev/wiki/CodeReviewComments)
26+
3. [Google Style Guide](https://google.github.io/styleguide/go/)
27+
28+
Style exceptions are acceptable when aligning with pre-existing "local" style from the same file or package, but they should still be noted.

‎.github/workflows/ccip-chaos-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ concurrency:
2121
jobs:
2222
run-e2e-tests-workflow:
2323
name: Run E2E Tests
24-
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@1b27374964a8d7dfea94a91c4b1eeae84fea66d6
24+
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@fed09778ce127da5d37f902d8bee01387856550a
2525
with:
2626
test_path: .github/e2e-tests.yml
2727
chainlink_version: ${{ github.sha }}
2828
require_chainlink_image_versions_in_qa_ecr: ${{ github.sha }}
2929
test_trigger: E2E CCIP Chaos Tests
3030
test_log_level: debug
3131
slack_notification_after_tests: on_failure
32-
slack_notification_after_tests_channel_id: '#ccip-testing'
32+
slack_notification_after_tests_channel_id: "#ccip-testing"
3333
slack_notification_after_tests_name: CCIP Chaos E2E Tests
3434
team: ${{ inputs.team }}
3535
secrets:

‎.github/workflows/ccip-load-tests.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# CCIP rarely runs these anymore. Leaving for now, but can likely be removed in the future.
22
name: CCIP Load Test
33
on:
4-
# push:
5-
# paths:
6-
# - '**/*ccip*'
7-
# - '**/*ccip*/**'
8-
# branches:
9-
# - develop
10-
# tags:
11-
# - '*'
4+
# push:
5+
# paths:
6+
# - '**/*ccip*'
7+
# - '**/*ccip*/**'
8+
# branches:
9+
# - develop
10+
# tags:
11+
# - '*'
1212
workflow_dispatch:
1313
inputs:
1414
test_config_override_path:
1515
description: Path to a test config file used to override the default test config
1616
required: false
1717
type: string
1818
test_secrets_override_key:
19-
description: 'Key to run tests with custom test secrets'
19+
description: "Key to run tests with custom test secrets"
2020
required: false
2121
type: string
2222
chainlink_version:
@@ -37,14 +37,14 @@ concurrency:
3737
jobs:
3838
run-e2e-tests-workflow:
3939
name: Run E2E Tests
40-
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@608298f511acfbcfd1099e5907ba1b1b0dda8b14
40+
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@fed09778ce127da5d37f902d8bee01387856550a
4141
with:
4242
test_path: .github/e2e-tests.yml
4343
test_trigger: E2E CCIP Load Tests
4444
test_config_override_path: ${{ inputs.test_config_override_path }}
4545
chainlink_version: ${{ inputs.chainlink_version || github.sha }}
4646
slack_notification_after_tests: always
47-
slack_notification_after_tests_channel_id: '#ccip-testing'
47+
slack_notification_after_tests_channel_id: "#ccip-testing"
4848
slack_notification_after_tests_name: CCIP E2E Load Tests
4949
test_image_suites: ccip-tests/load
5050
team: ${{ inputs.team || 'ccip' }}

‎.github/workflows/client-compatibility-tests.yml‎

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,10 @@ jobs:
286286
check-ecr-images-exist:
287287
name: Check images used as test dependencies exist in ECR
288288
if: always() && needs.should-run.outputs.should_run == 'true' && (needs.select-versions.outputs.evm_implementations != '' || github.event.inputs.base64TestList != '')
289-
environment: integration
289+
environment:
290+
# http://docs.github.com/en/actions/how-tos/deploy/configure-and-manage-deployments/control-deployments#using-environments-without-deployments
291+
name: integration
292+
deployment: false
290293
permissions:
291294
id-token: write
292295
contents: read
@@ -329,7 +332,10 @@ jobs:
329332
needs.select-versions.outputs.evm_implementations != '' ||
330333
github.event.inputs.base64TestList != ''
331334
)
332-
environment: integration
335+
environment:
336+
# http://docs.github.com/en/actions/how-tos/deploy/configure-and-manage-deployments/control-deployments#using-environments-without-deployments
337+
name: integration
338+
deployment: false
333339
permissions:
334340
id-token: write
335341
contents: read
@@ -348,7 +354,7 @@ jobs:
348354
image-tag: ${{ inputs.chainlinkVersion || needs.select-versions.outputs.chainlink_image_version || github.sha }}
349355
dockerfile: core/chainlink.Dockerfile
350356
docker-registry-url: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com
351-
docker-repository-name: 'chainlink'
357+
docker-repository-name: "chainlink"
352358
docker-additional-build-args: |
353359
DOCKER_TAG=${{ inputs.chainlinkVersion || needs.select-versions.outputs.chainlink_image_version || github.sha }}
354360
aws-account-number: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
@@ -359,11 +365,13 @@ jobs:
359365
# for tagged releases Docker image version is different from the Chainlink version (v2.13.0 -> 2.13.0)
360366
# for all other cases (PRs, commits, etc.) Docker image version is the same as the Chainlink version
361367

362-
363368
get-latest-available-images:
364369
name: Get Latest EVM Implementation's Images
365370
if: always() && needs.should-run.outputs.should_run == 'true' && needs.select-versions.outputs.evm_implementations != '' && github.event.inputs.base64TestList == ''
366-
environment: integration
371+
environment:
372+
# http://docs.github.com/en/actions/how-tos/deploy/configure-and-manage-deployments/control-deployments#using-environments-without-deployments
373+
name: integration
374+
deployment: false
367375
runs-on: ubuntu-latest
368376
needs: [check-ecr-images-exist, should-run, select-versions]
369377
permissions:
@@ -442,7 +450,10 @@ jobs:
442450
prepare-compatibility-matrix:
443451
name: Prepare Compatibility Matrix
444452
if: always() && needs.should-run.outputs.should_run == 'true' && (needs.select-versions.outputs.evm_implementations != '' || github.event.inputs.base64TestList != '')
445-
environment: integration
453+
environment:
454+
# http://docs.github.com/en/actions/how-tos/deploy/configure-and-manage-deployments/control-deployments#using-environments-without-deployments
455+
name: integration
456+
deployment: false
446457
permissions:
447458
checks: write
448459
pull-requests: write
@@ -544,7 +555,10 @@ jobs:
544555
run-client-compatibility-matrix:
545556
name: ${{ matrix.evm_node.product }} compatibility with ${{ matrix.evm_node.docker_image }}
546557
if: always() && needs.should-run.outputs.should_run == 'true' && (needs.build-chainlink.result == 'success' || needs.build-chainlink.result == 'skipped') && needs.prepare-compatibility-matrix.outputs.matrix != ''
547-
environment: integration
558+
environment:
559+
# http://docs.github.com/en/actions/how-tos/deploy/configure-and-manage-deployments/control-deployments#using-environments-without-deployments
560+
name: integration
561+
deployment: false
548562
permissions:
549563
checks: write
550564
pull-requests: write
@@ -657,7 +671,10 @@ jobs:
657671
start-slack-thread:
658672
name: Start Slack Thread
659673
if: always() && needs.*.result != 'skipped' && needs.*.result != 'cancelled' && needs.should-run.outputs.should_run == 'true' && (needs.select-versions.outputs.evm_implementations != '' || github.event.inputs.base64TestList != '')
660-
environment: integration
674+
environment:
675+
# http://docs.github.com/en/actions/how-tos/deploy/configure-and-manage-deployments/control-deployments#using-environments-without-deployments
676+
name: integration
677+
deployment: false
661678
outputs:
662679
thread_ts: ${{ steps.slack.outputs.thread_ts }}
663680
permissions:
@@ -723,7 +740,10 @@ jobs:
723740
parse-test-results:
724741
name: Parse Test Results
725742
if: always() && needs.*.result != 'skipped' && needs.*.result != 'cancelled' && needs.should-run.outputs.should_run == 'true' && (needs.select-versions.outputs.evm_implementations != '' || github.event.inputs.base64TestList != '')
726-
environment: integration
743+
environment:
744+
# http://docs.github.com/en/actions/how-tos/deploy/configure-and-manage-deployments/control-deployments#using-environments-without-deployments
745+
name: integration
746+
deployment: false
727747
permissions:
728748
checks: write
729749
pull-requests: write
@@ -763,7 +783,10 @@ jobs:
763783
display-test-results:
764784
name: Aggregated test results
765785
if: always() && needs.*.result != 'skipped' && needs.*.result != 'cancelled' && needs.should-run.outputs.should_run == 'true' && needs.parse-test-results.result == 'success'
766-
environment: integration
786+
environment:
787+
# http://docs.github.com/en/actions/how-tos/deploy/configure-and-manage-deployments/control-deployments#using-environments-without-deployments
788+
name: integration
789+
deployment: false
767790
permissions:
768791
checks: write
769792
pull-requests: write
@@ -809,7 +832,10 @@ jobs:
809832
post-test-results-to-slack:
810833
name: Post Test Results for ${{matrix.product}}
811834
if: always() && needs.*.result != 'skipped' && needs.*.result != 'cancelled' && needs.should-run.outputs.should_run == 'true' && needs.parse-test-results.result == 'success'
812-
environment: integration
835+
environment:
836+
# http://docs.github.com/en/actions/how-tos/deploy/configure-and-manage-deployments/control-deployments#using-environments-without-deployments
837+
name: integration
838+
deployment: false
813839
permissions:
814840
checks: write
815841
pull-requests: write

‎.github/workflows/cre-local-env-tests.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ on:
2929
jobs:
3030
changes:
3131
runs-on: runs-on=${{ github.run_id }}/cpu=16/ram=64/family=m6i/spot=false/image=ubuntu24-full-x64/extras=s3-cache+tmpfs
32-
environment: "integration"
32+
environment:
33+
# http://docs.github.com/en/actions/how-tos/deploy/configure-and-manage-deployments/control-deployments#using-environments-without-deployments
34+
name: integration
35+
deployment: false
3336
permissions:
3437
contents: read
3538
outputs:
@@ -57,7 +60,10 @@ jobs:
5760
5861
test-cli:
5962
runs-on: runs-on=${{ github.run_id }}/cpu=16/ram=64/family=m6i/spot=false/image=ubuntu24-full-x64/extras=s3-cache+tmpfs
60-
environment: "integration"
63+
environment:
64+
# http://docs.github.com/en/actions/how-tos/deploy/configure-and-manage-deployments/control-deployments#using-environments-without-deployments
65+
name: integration
66+
deployment: false
6167
timeout-minutes: 15
6268
permissions:
6369
contents: read

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,10 @@ jobs:
9595
# we need a `test_id` and `run_attempt` here to stop runner stealing
9696
# see: https://runs-on.com/guides/troubleshoot/#runner-stealing-and-matrix-jobs
9797
runs-on: runs-on=${{ github.run_id }}-${{ matrix.tests.test_id }}-${{ github.run_attempt }}/cpu=16/ram=64/family=m6i+m5.*/spot=false/image=ubuntu24-full-x64/extras=s3-cache+tmpfs
98-
environment: "integration"
98+
environment:
99+
# http://docs.github.com/en/actions/how-tos/deploy/configure-and-manage-deployments/control-deployments#using-environments-without-deployments
100+
name: integration
101+
deployment: false
99102
timeout-minutes: 60
100103
env:
101104
ENABLE_AUTO_QUARANTINE: "true"

‎.github/workflows/cre-soak-memory-leak.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ on:
2525
jobs:
2626
soak:
2727
name: CRE PoR Memory Leak Soak
28+
environment:
29+
name: integration
30+
deployment: false
2831
runs-on: runs-on=${{ github.run_id }}/cpu=8+16/ram=32+64/family=c6id+m6id+m6idn/spot=false/image=ubuntu24-full-x64/extras=s3-cache
29-
environment: "integration"
3032
timeout-minutes: 270 # 4h30m — test timeout is 4h20m
3133
permissions:
3234
contents: read

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,10 @@ jobs:
142142
# we need a `test_id` and `run_attempt` here to stop runner stealing
143143
# see: https://runs-on.com/guides/troubleshoot/#runner-stealing-and-matrix-jobs
144144
runs-on: runs-on=${{ github.run_id }}-${{ matrix.tests.test_id }}-${{ github.run_attempt }}/cpu=16/ram=64/family=m6i+m5.*/spot=false/image=ubuntu24-full-x64/extras=s3-cache+tmpfs
145-
environment: "integration"
145+
environment:
146+
# http://docs.github.com/en/actions/how-tos/deploy/configure-and-manage-deployments/control-deployments#using-environments-without-deployments
147+
name: integration
148+
deployment: false
146149
timeout-minutes: 60
147150
env:
148151
ENABLE_AUTO_QUARANTINE: "true"

‎.github/workflows/cre-workflow-don-benchmark.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ on:
2929
jobs:
3030
workflow-don-benchmark:
3131
runs-on: ubuntu-latest
32-
environment: "integration"
32+
environment:
33+
# http://docs.github.com/en/actions/how-tos/deploy/configure-and-manage-deployments/control-deployments#using-environments-without-deployments
34+
name: integration
35+
deployment: false
3336
timeout-minutes: 30
3437
permissions:
3538
contents: read

0 commit comments

Comments
 (0)