From 93f77090f162561f3f956ab840c0c062d2b2c926 Mon Sep 17 00:00:00 2001 From: chray-zhang Date: Thu, 14 Nov 2024 21:21:17 -0500 Subject: [PATCH] Editted Makefile and workflow --- .github/workflows/integration-tests-smoke.yml | 4 ++-- Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration-tests-smoke.yml b/.github/workflows/integration-tests-smoke.yml index 5d8c4fba6..ad4dff4a9 100644 --- a/.github/workflows/integration-tests-smoke.yml +++ b/.github/workflows/integration-tests-smoke.yml @@ -202,10 +202,10 @@ jobs: uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@00c164251be2a7c5b2b23a6e5f7014982f232c14 # v2.3.31 with: aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }} - test_command_to_run: nix develop -c sh -c "make test=${{ matrix.image.test-name }} test-integration-smoke-ci" && \ + test_command_to_run: nix develop -c sh -c "make test=${{ matrix.image.test-name }} test-integration-smoke-ci" + test_download_vendor_packages_command: cd integration-tests && nix develop -c go mod download && \ git config --global url."https://x-access-token:${{ steps.setup-github-token.outputs.access-token }}@github.com/".insteadOf "https://github.com/" && \ go env -w GOPRIVATE=github.com/smartcontractkit/* - test_download_vendor_packages_command: cd integration-tests && nix develop -c go mod download cl_repo: ${{ env.CL_ECR }} cl_image_tag: starknet.${{ github.sha }}${{ matrix.image.tag-suffix }} token: ${{ steps.setup-github-token.outputs.access-token }} diff --git a/Makefile b/Makefile index 7cdd24af0..f6848f5ef 100644 --- a/Makefile +++ b/Makefile @@ -170,15 +170,15 @@ format-ts-check: .PHONY: lint-go-ops lint-go-ops: - cd ./ops && golangci-lint --color=always --out-format checkstyle:golangci-lint-ops-report.xml run + cd ./ops && golangci-lint --config ./.golangci.yml --color=always --out-format checkstyle:golangci-lint-ops-report.xml run .PHONY: lint-go-relayer lint-go-relayer: - cd ./relayer && golangci-lint --color=always --out-format checkstyle:golangci-lint-relayer-report.xml run + cd ./relayer && golangci-lint --config ./.golangci.yml --color=always --out-format checkstyle:golangci-lint-relayer-report.xml run .PHONY: lint-go-test lint-go-test: - cd ./integration-tests && golangci-lint --color=always --exclude=dot-imports --out-format checkstyle:golangci-lint-integration-tests-report.xml run + cd ./integration-tests && golangci-lint --config ./.golangci.yml --color=always --exclude=dot-imports --out-format checkstyle:golangci-lint-integration-tests-report.xml run .PHONY: test-go test-go: test-unit-go test-unit-go-race test-integration-go