Fixes

smartcontractkit · Aug 13, 2024 · be2a0b7 · be2a0b7
1 parent 39d94a3
commit be2a0b7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/ccip-chaos-tests.yml b/.github/workflows/ccip-chaos-tests.yml
@@ -3,7 +3,7 @@ on:
   workflow_run:
     workflows: [ CCIP Load Test ]
     types: [ completed ]
-    branches: [ ccip-develop ]
+    branches: [ develop ]
   workflow_dispatch:
 
 

diff --git a/.github/workflows/ccip-load-tests.yml b/.github/workflows/ccip-load-tests.yml
@@ -2,7 +2,7 @@ name: CCIP Load Test
 on: 
   push:
     branches:
-      - ccip-develop
+      - develop
     tags:
       - '*'
   workflow_dispatch:

diff --git a/.github/workflows/chain-selectors-check.yml b/.github/workflows/chain-selectors-check.yml
@@ -3,7 +3,7 @@ name: Chain Selectors Version Check
 on:
   push:
     branches:
-      - ccip-develop
+      - develop
       - release/*
     tags:
       - v*

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -511,9 +511,6 @@ jobs:
 
       - name: Print failed test summary
         if: always()
-<<<<<<< HEAD
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/show-test-summary@70ccaef155381025e411cf7cd1fa5ef8f668ed75 # v2.3.25
-=======
         uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/show-test-summary@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
 
   eth-smoke-tests-matrix-ccip:
@@ -831,7 +828,6 @@ jobs:
         with:
           test_directories: ./integration-tests/smoke/
 
->>>>>>> 92111d036103b923d30e829d8b9819cce8cdb4ed
 
   eth-smoke-tests-matrix:
     if: ${{ !contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') }}

diff --git a/integration-tests/go.mod b/integration-tests/go.mod
@@ -31,7 +31,7 @@ require (
 	github.com/segmentio/ksuid v1.0.4
 	github.com/shopspring/decimal v1.4.0
 	github.com/slack-go/slack v0.12.2
-	github.com/smartcontractkit/chain-selectors v1.0.10
+	github.com/smartcontractkit/chain-selectors v1.0.21
 	github.com/smartcontractkit/chainlink-automation v1.0.4
 	github.com/smartcontractkit/chainlink-common v0.2.2-0.20240808143317-6b16fc28887d
 	github.com/smartcontractkit/chainlink-testing-framework v1.34.2

diff --git a/integration-tests/go.sum b/integration-tests/go.sum
@@ -1484,8 +1484,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/slack-go/slack v0.12.2 h1:x3OppyMyGIbbiyFhsBmpf9pwkUzMhthJMRNmNlA4LaQ=
 github.com/slack-go/slack v0.12.2/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
-github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCqR1LNS7aI3jT0V+xGrg=
-github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
+github.com/smartcontractkit/chain-selectors v1.0.21 h1:KCR9SA7PhOexaBzFieHoLv1WonwhVOPtOStpqTmLC4E=
+github.com/smartcontractkit/chain-selectors v1.0.21/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
 github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
 github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20240806144315-04ac101e9c95 h1:LAgJTg9Yr/uCo2g7Krp88Dco2U45Y6sbJVl8uKoLkys=
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: CCIP Load Test @@
     on:
       push:
         branches:
-          - ccip-develop
+          - develop
         tags:
           - '*'
       workflow_dispatch:
@@ Expand Down @@