From d5c9486e03f901cb0b812a765a2a73e39f63c714 Mon Sep 17 00:00:00 2001 From: Tate Date: Tue, 6 Dec 2022 14:51:21 -0700 Subject: [PATCH] add tidy check --- .github/workflows/e2e_custom_cl.yml | 6 +++--- .github/workflows/relay.yml | 5 +++++ tests/go.mod | 4 ++-- tests/go.sum | 3 +++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml index 993a16311..2a6ec02f1 100644 --- a/.github/workflows/e2e_custom_cl.yml +++ b/.github/workflows/e2e_custom_cl.yml @@ -54,7 +54,7 @@ jobs: contents: read steps: - name: Build Image - uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@5ca2b0a07d534f216fb97ab54e69d3fdcf03de11 # v2.0.25 + uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@966f889fe6989138e01773204ff23d96d0b485aa # v2.0.30 with: cl_repo: smartcontractkit/chainlink # by default we are integrating with develop @@ -84,7 +84,7 @@ jobs: - name: Checkout the repo uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0 - name: Run Tests - uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@5ca2b0a07d534f216fb97ab54e69d3fdcf03de11 # v2.0.25 + uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@966f889fe6989138e01773204ff23d96d0b485aa # v2.0.30 with: test_command_to_run: make test_smoke go_mod_path: ./tests/go.mod @@ -100,6 +100,6 @@ jobs: QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }} - name: cleanup if: always() - uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/cleanup@5ca2b0a07d534f216fb97ab54e69d3fdcf03de11 # v2.0.25 + uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/cleanup@966f889fe6989138e01773204ff23d96d0b485aa # v2.0.30 with: triggered_by: ${{ env.TEST_TRIGGERED_BY }} diff --git a/.github/workflows/relay.yml b/.github/workflows/relay.yml index 509185a42..5fd6874d7 100644 --- a/.github/workflows/relay.yml +++ b/.github/workflows/relay.yml @@ -15,6 +15,11 @@ jobs: with: go-version-file: "go.mod" check-latest: true + - name: Check go mod tidy + run: | + go mod tidy + echo "if this fails run 'go mod tidy' to fix" + git diff --stat --exit-code - name: Install Solana CLI run: ./scripts/install-solana-ci.sh - name: Build diff --git a/tests/go.mod b/tests/go.mod index 1e72e9b4f..f90bdea90 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -17,7 +17,7 @@ require ( github.com/smartcontractkit/chainlink-env v0.2.55 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20221027174234-50b4d94d7135 github.com/smartcontractkit/chainlink-testing-framework v1.8.5 - github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20221130214003-2872a0d0504f + github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20221206171451-ede2dc1e2b53 github.com/smartcontractkit/libocr v0.0.0-20221121171434-482da3ed36d8 golang.org/x/crypto v0.1.0 golang.org/x/sync v0.1.0 @@ -277,7 +277,7 @@ require ( github.com/smartcontractkit/chainlink-relay v0.1.6-0.20221205145242-57d65316ed43 // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.0-20220930034704-572ac07611cb // indirect github.com/smartcontractkit/ocr2keepers v0.4.8 // indirect - github.com/smartcontractkit/ocr2vrf v0.0.0-20221108213147-df72abedd302 // indirect + github.com/smartcontractkit/ocr2vrf v0.0.0-20221206151523-7ae0ec615c0e // indirect github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb // indirect github.com/smartcontractkit/terra.go v1.0.3-0.20220108002221-62b39252ee16 // indirect github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect diff --git a/tests/go.sum b/tests/go.sum index 74e765823..59993a92c 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -1616,12 +1616,15 @@ github.com/smartcontractkit/chainlink-testing-framework v1.8.5 h1:lsGqtTYqT1V2j8 github.com/smartcontractkit/chainlink-testing-framework v1.8.5/go.mod h1:ajdhuex4G92Cb1Dt/iuZmLDbBHBgoNHifBPqg1lLju4= github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20221130214003-2872a0d0504f h1:Z0+ReyancclipHBahd1gD14H9UDiXp1WMfL6lERyvr0= github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20221130214003-2872a0d0504f/go.mod h1:Fn7JvVUmPPrgENx3szeWo+nSep0KCKdFzwPu3ayy1l8= +github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20221206171451-ede2dc1e2b53 h1:HtxdmBooP6BsQ86Vc5cdMGhlyVD0Cq1IdT9jSlaStac= +github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20221206171451-ede2dc1e2b53/go.mod h1:7usGRFBQMPk9Xiavrzi4Ff/gdIvubbiLu2ufmSlvZEU= github.com/smartcontractkit/libocr v0.0.0-20221121171434-482da3ed36d8 h1:KcTNxuP5g3GGUqn3WJe7KKnTixqfVZjmHnMAnKkLGJw= github.com/smartcontractkit/libocr v0.0.0-20221121171434-482da3ed36d8/go.mod h1:5JnCHuYgmIP9ZyXzgAfI5Iwu0WxBtBKp+ApeT5o1Cjw= github.com/smartcontractkit/ocr2keepers v0.4.8 h1:pvCDWIsYaSJI/M6qw0xIIXpHs5MPQaYEpmWsJiyi6LM= github.com/smartcontractkit/ocr2keepers v0.4.8/go.mod h1:6wSlAWYBmlJM7bDZ4Ewc5J5AJQszIRGDNaUAw35r3qc= github.com/smartcontractkit/ocr2vrf v0.0.0-20221108213147-df72abedd302 h1:r+AUXFhKLerpaNdAm0H+nMHvPUTb4uv8oRWBwlCfM28= github.com/smartcontractkit/ocr2vrf v0.0.0-20221108213147-df72abedd302/go.mod h1:NKkp8yf3trq+hJe/gn2Q1dd4abZvcYavUKPzYJCgVew= +github.com/smartcontractkit/ocr2vrf v0.0.0-20221206151523-7ae0ec615c0e/go.mod h1:NKkp8yf3trq+hJe/gn2Q1dd4abZvcYavUKPzYJCgVew= github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb h1:OMaBUb4X9IFPLbGbCHsMU+kw/BPCrewaVwWGIBc0I4A= github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb/go.mod h1:HNUu4cJekUdsJbwRBCiOybtkPJEfGRELQPe2tkoDEyk= github.com/smartcontractkit/terra.go v1.0.3-0.20220108002221-62b39252ee16 h1:k+E0RKzVSG1QpxXakNUtcGUhq4ZMe0MAJ5Awg/l9oSc=