Skip to content

Commit efca2ab

Browse files
committed
Merge branch 'develop' into feature/PLEX-2611-cre-don2don-accept-ocr-attestatin
# Conflicts: # core/scripts/go.mod # core/scripts/go.sum # deployment/go.mod # deployment/go.sum # go.mod # go.sum # integration-tests/go.mod # integration-tests/go.sum # integration-tests/load/go.mod # integration-tests/load/go.sum # system-tests/lib/go.mod # system-tests/lib/go.sum # system-tests/tests/go.mod # system-tests/tests/go.sum
2 parents de3addc + 6f7cb9b commit efca2ab

448 files changed

Lines changed: 2194 additions & 77011 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/confidential-workflow-execution.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/cw-fetcher-and-system-tests.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/gold-kites-bake.md

Lines changed: 0 additions & 5 deletions
This file was deleted.
File renamed without changes.

.changeset/remove-binary-url-resolver.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/CODEOWNERS

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
/core/services/webhook/ @smartcontractkit/foundations @smartcontractkit/bix-framework @smartcontractkit/core
3939
/core/services/llo/ @smartcontractkit/data-streams-engineers @smartcontractkit/core
4040

41-
# CCIP
42-
/core/services/ccip/ @smartcontractkit/ccip
43-
/core/services/ocr2/plugins/ccip/ @smartcontractkit/ccip
44-
4541
# VRF-related services
4642
/core/services/vrf/ @smartcontractkit/dev-services @smartcontractkit/core
4743
/core/services/blockhashstore/ @smartcontractkit/dev-services @smartcontractkit/core

.github/actionlint.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# See https://github.com/rhysd/actionlint/blob/main/docs/config.md
2+
3+
paths:
4+
.github/workflows/**/*.{yml,yaml}:
5+
ignore:
6+
# ignore unknown runner labels, as we have fully custom runners
7+
- 'label ".*" is unknown. available labels are .*'
8+
# https://www.shellcheck.net/wiki/SC2129
9+
- '.*SC2129:style:1:1:.*'
10+

.github/workflows/build-publish.yml

Lines changed: 40 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ jobs:
4444
4545
- name: Detect prerelease phase
4646
id: detect-prerelease-phase
47-
if: ${{ steps.release-tag-check.outputs.is-pre-release == 'true' && (contains(github.ref_name, '-beta.') || contains(github.ref_name, '-rc.')) }}
47+
if: ${{ steps.release-tag-check.outputs.is-pre-release == 'true' &&
48+
(contains(github.ref_name, '-beta.') || contains(github.ref_name,
49+
'-rc.')) }}
4850
shell: bash
4951
env:
5052
GIT_TAG: ${{ github.ref_name }}
@@ -89,7 +91,7 @@ jobs:
8991
github-token: ${{ secrets.GITHUB_TOKEN }}
9092

9193
docker-core:
92-
needs: [checks]
94+
needs: [ checks ]
9395
# No need to build the final image as we promote the last RC to use the final tag
9496
# so we only run the builds for pre-releases.
9597
if: needs.checks.outputs.is-pre-release == 'true'
@@ -111,7 +113,8 @@ jobs:
111113
docker-cache-behaviour: "disable"
112114
docker-manifest-sign: true
113115
docker-registry-url-override: public.ecr.aws/chainlink
114-
github-runner-arm64: ${{ github.repository != 'smartcontractkit/chainlink' && 'ubuntu-24.04-4cores-16GB-ARM' || 'ubuntu-24.04-arm' }}
116+
github-runner-arm64: ${{ github.repository != 'smartcontractkit/chainlink' &&
117+
'ubuntu-24.04-4cores-16GB-ARM' || 'ubuntu-24.04-arm' }}
115118
docker-image-tag-strip-prefix: v # strip out the "v" prefix from the git tag for the image tag.
116119
git-sha: ${{ github.sha }}
117120
github-event-name: ${{ github.event_name }}
@@ -125,7 +128,7 @@ jobs:
125128
AWS_LAMBDA_GATI_URL: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }}
126129

127130
docker-ccip:
128-
needs: [checks]
131+
needs: [ checks ]
129132
# No need to build the final image as we promote the last RC to use the final tag
130133
# so we only run the builds for pre-releases.
131134
if: needs.checks.outputs.is-pre-release == 'true'
@@ -150,7 +153,8 @@ jobs:
150153
docker-cache-behaviour: "disable"
151154
docker-manifest-sign: true
152155
docker-registry-url-override: public.ecr.aws/chainlink
153-
github-runner-arm64: ${{ github.repository != 'smartcontractkit/chainlink' && 'ubuntu-24.04-4cores-16GB-ARM' || 'ubuntu-24.04-arm' }}
156+
github-runner-arm64: ${{ github.repository != 'smartcontractkit/chainlink' &&
157+
'ubuntu-24.04-4cores-16GB-ARM' || 'ubuntu-24.04-arm' }}
154158
docker-image-tag-override: ${{ needs.checks.outputs.ccip-image-tag }}
155159
git-sha: ${{ github.sha }}
156160
github-event-name: ${{ github.event_name }}
@@ -165,9 +169,10 @@ jobs:
165169

166170
deploy:
167171
name: "Deploy"
168-
needs: [checks, docker-ccip]
172+
needs: [ checks, docker-ccip ]
169173
# We are only deploying CCIP pre-releases and skipping hotfix deployments for now.
170-
if: needs.checks.outputs.is-pre-release == 'true' && needs.checks.outputs.is-hotfix == 'false'
174+
if: needs.checks.outputs.is-pre-release == 'true' &&
175+
needs.checks.outputs.is-hotfix == 'false'
171176
runs-on: ubuntu-latest
172177
permissions:
173178
contents: read
@@ -207,28 +212,41 @@ jobs:
207212
products: |
208213
ccip-prereleases-prod-testnet
209214
210-
post-build:
211-
needs: [docker-core, docker-ccip]
212-
name: Post-Build Actions
213-
uses: ./.github/workflows/post-build.yml
214-
secrets: inherit
215+
emit-pre-release-image-published-event:
216+
name: Emit pre-release image published event
217+
needs: [ docker-core ]
218+
runs-on: ubuntu-latest
215219
permissions:
216-
actions: read
217-
checks: write
218-
id-token: write
219-
contents: read
220-
with:
221-
chainlink_core_full_image: ${{ needs.docker-core.result == 'success' && format('public.ecr.aws/chainlink/chainlink:{0}|{1}', needs.docker-core.outputs.docker-manifest-tag, needs.docker-core.outputs.docker-manifest-digest) || '' }}
222-
chainlink_ccip_full_image: ${{ needs.docker-ccip.result == 'success' && format('public.ecr.aws/chainlink/ccip:{0}|{1}', needs.docker-ccip.outputs.docker-manifest-tag, needs.docker-ccip.outputs.docker-manifest-digest) || '' }}
223-
chainlink_version: ${{ github.ref_name }}
220+
contents: write
221+
steps:
222+
- name: Emit pre-release image published event
223+
env:
224+
DOCKER_MANIFEST_TAG: ${{ needs.docker-core.outputs.docker-manifest-tag }}
225+
GITHUB_REF_NAME: ${{ github.ref_name }}
226+
GH_TOKEN: ${{ github.token }}
227+
run: |
228+
gh api \
229+
--method POST \
230+
-H "Accept: application/vnd.github+json" \
231+
"/repos/${GITHUB_REPOSITORY}/dispatches" \
232+
--input - <<JSON
233+
{
234+
"event_type": "pre-release-image-published",
235+
"client_payload": {
236+
"chainlink_image_tag": "${DOCKER_MANIFEST_TAG}",
237+
"chainlink_version": "${GITHUB_REF_NAME}"
238+
}
239+
}
240+
JSON
224241
225242
# Notify Slack channel for new git tags associated with pre-releases.
226243
# Final release notifications originate from the release coordinator repo.
227244
slack-notify:
228245
permissions:
229246
contents: read
230-
if: always() && (needs.docker-core.result == 'success' || needs.docker-ccip.result == 'success')
231-
needs: [checks, docker-core, docker-ccip]
247+
if: always() && (needs.docker-core.result == 'success' ||
248+
needs.docker-ccip.result == 'success')
249+
needs: [ checks, docker-core, docker-ccip ]
232250
uses: ./.github/workflows/release-notifications.yml
233251
secrets: inherit
234252
with:

.github/workflows/devenv-compat.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ on:
7373

7474
jobs:
7575
compatibility:
76+
name: Upgrade Compatibility Test
7677
permissions:
7778
id-token: write
7879
contents: read

.github/workflows/docker-build.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ jobs:
4848
id: runner-labels
4949
shell: bash
5050
env:
51-
SH_RUNNER_LABEL_ARM64: runs-on=${{ github.run_id }}/cpu=8/ram=16/family=c7g/volume=80gb/spot=false/image=ubuntu24-full-arm64
52-
SH_RUNNER_LABEL_AMD64: runs-on=${{ github.run_id }}/cpu=8/ram=16/family=c7a/volume=80gb/spot=false/image=ubuntu24-full-x64
51+
SH_RUNNER_LABEL_ARM64: runs-on=${{ github.run_id
52+
}}/cpu=8/ram=16/family=c7g/volume=80gb/spot=false/image=ubuntu24-full-arm64
53+
SH_RUNNER_LABEL_AMD64: runs-on=${{ github.run_id
54+
}}/cpu=8/ram=16/family=c7a/volume=80gb/spot=false/image=ubuntu24-full-x64
5355
GH_RUNNER_LABEL_ARM64: ubuntu-24.04-arm
5456
GH_RUNNER_LABEL_AMD64: ubuntu-24.04
5557
run: |
@@ -81,7 +83,7 @@ jobs:
8183
echo "version-tag=${version_tag}" | tee -a "$GITHUB_OUTPUT"
8284
8385
docker-core:
84-
needs: [init]
86+
needs: [ init ]
8587
if: ${{ needs.init.outputs.should-run == 'true' }}
8688
permissions:
8789
contents: read
@@ -113,7 +115,7 @@ jobs:
113115
AWS_LAMBDA_GATI_URL: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }}
114116

115117
docker-core-plugins:
116-
needs: [init]
118+
needs: [ init ]
117119
if: ${{ needs.init.outputs.should-run == 'true' }}
118120
permissions:
119121
contents: read
@@ -147,7 +149,7 @@ jobs:
147149
AWS_LAMBDA_GATI_URL: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }}
148150

149151
docker-core-plugins-testing:
150-
needs: [init]
152+
needs: [ init ]
151153
if: ${{ needs.init.outputs.should-run == 'true' }}
152154
permissions:
153155
contents: read
@@ -182,7 +184,7 @@ jobs:
182184
AWS_LAMBDA_GATI_URL: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }}
183185

184186
docker-ccip:
185-
needs: [init]
187+
needs: [ init ]
186188
if: ${{ needs.init.outputs.should-run == 'true' }}
187189
permissions:
188190
contents: read
@@ -217,7 +219,7 @@ jobs:
217219
AWS_LAMBDA_GATI_URL: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }}
218220

219221
docker-ccip-plugins:
220-
needs: [init]
222+
needs: [ init ]
221223
if: ${{ needs.init.outputs.should-run == 'true' }}
222224
permissions:
223225
contents: read
@@ -252,8 +254,9 @@ jobs:
252254
AWS_LAMBDA_GATI_URL: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }}
253255

254256
call-post-docker-build:
255-
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
256-
needs: [init, docker-core]
257+
if: ${{ github.event_name == 'schedule' || github.event_name ==
258+
'workflow_dispatch' }}
259+
needs: [ init, docker-core ]
257260
uses: ./.github/workflows/post-docker-build.yml
258261
permissions:
259262
actions: read
@@ -268,7 +271,7 @@ jobs:
268271
if: false
269272
# temporarily disabled
270273
# if: ${{ github.event_name == 'schedule' }}
271-
needs: [docker-core]
274+
needs: [ docker-core ]
272275
permissions:
273276
contents: read
274277
id-token: write
@@ -283,14 +286,15 @@ jobs:
283286
aws-region: ${{ secrets.AWS_REGION }}
284287
repo-destination: ${{ secrets.REPO_K8S_DEPLOY }}
285288
oci-image-tag: ${{ needs.docker-core.outputs.docker-manifest-tag }}
286-
oci-repository-url: ${{ format('{0}.dkr.ecr.{1}.amazonaws.com/chainlink', secrets.AWS_ACCOUNT_ID_SDLC, secrets.AWS_REGION) }}
289+
oci-repository-url: ${{ format('{0}.dkr.ecr.{1}.amazonaws.com/chainlink',
290+
secrets.AWS_ACCOUNT_ID_SDLC, secrets.AWS_REGION) }}
287291
pr-close-enabled: false
288292
products: |
289293
cre
290294
291295
deploy-nightly-ccip:
292296
if: ${{ github.event_name == 'schedule' }}
293-
needs: [docker-ccip]
297+
needs: [ docker-ccip ]
294298
permissions:
295299
contents: read
296300
id-token: write
@@ -305,7 +309,8 @@ jobs:
305309
aws-region: ${{ secrets.AWS_REGION }}
306310
repo-destination: ${{ secrets.REPO_K8S_DEPLOY }}
307311
oci-image-tag: ${{ needs.docker-ccip.outputs.docker-manifest-tag }}
308-
oci-repository-url: ${{ format('{0}.dkr.ecr.{1}.amazonaws.com/ccip', secrets.AWS_ACCOUNT_ID_SDLC, secrets.AWS_REGION) }}
312+
oci-repository-url: ${{ format('{0}.dkr.ecr.{1}.amazonaws.com/ccip',
313+
secrets.AWS_ACCOUNT_ID_SDLC, secrets.AWS_REGION) }}
309314
pr-close-enabled: false
310315
products: |
311316
ccip-nightlies

0 commit comments

Comments
 (0)