From f5145c586081b58ae4411cb014721e9a32034c77 Mon Sep 17 00:00:00 2001 From: kaustubhkapatral Date: Fri, 2 Jan 2026 12:24:52 +0530 Subject: [PATCH 1/2] bumped ci packages --- .github/linters/.golangci.yaml | 40 +++++++++------------- .github/workflows/build.yml | 8 ++--- .github/workflows/codeql.yml | 2 +- .github/workflows/lint.yml | 14 ++++---- .github/workflows/pull-request.yml | 2 +- .github/workflows/release.yml | 10 +++--- .github/workflows/test.yml | 54 +++++++++++++++--------------- 7 files changed, 61 insertions(+), 69 deletions(-) diff --git a/.github/linters/.golangci.yaml b/.github/linters/.golangci.yaml index c1f372bea..2575a1bc5 100644 --- a/.github/linters/.golangci.yaml +++ b/.github/linters/.golangci.yaml @@ -1,3 +1,5 @@ +version: "2" + run: timeout: 10m go: "1.23" @@ -6,15 +8,12 @@ linters: enable: - bodyclose - copyloopvar - - depguard + # - depguard # Disabled - no import restrictions applied earlier - dogsled - errcheck - goconst - gocritic - - gofumpt - - gofmt - - goimports - - gosimple + # - gosimple # Merged into staticcheck in v2 - govet - ineffassign - misspell @@ -22,16 +21,16 @@ linters: - nestif - nolintlint - staticcheck - - stylecheck - - typecheck + # - stylecheck # Merged into staticcheck in v2 + # - typecheck # Removed in v2 - unconvert - unused - -issues: - exclude-rules: - - text: "ST1003:" - linters: - - stylecheck + +formatters: + enable: + - gofumpt + - goimports + linters-settings: dogsled: @@ -46,14 +45,16 @@ linters-settings: disabled-checks: - regexpMust - badCall # Remove this after CI workflow PR - + misspell: ignore-words: - cheqd - cheq - ncheq - stylecheck: + staticcheck: + # Select the Go version to target. + go: "1.23" # STxxxx checks in https://staticcheck.io/docs/configuration/options/#checks # Default: ["*"] checks: ["all"] @@ -64,16 +65,7 @@ linters-settings: # https://staticcheck.io/docs/configuration/options/#initialisms initialisms: ["ACL", "API", "ASCII", "CPU", "CSS", "DNS", "EOF", "GUID", "HTML", "HTTP", "HTTPS", "ID", "IP", "JSON", "QPS", "RAM", "RPC", "SLA", "SMTP", "SQL", "SSH", "TCP", "TLS", "TTL", "UDP", "UI", "GID", "UID", "UUID", "URI", "URL", "UTF8", "VM", "XML", "XMPP", "XSRF", "XSS", "SIP", "RTP", "AMQP", "DB", "TS"] - depguard: - rules: - main: - files: - - $all - list-mode: lax - allow: "*" - goconst: min-occurrences: 5 ignore-tests: true ignore-strings: "echo '" - \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2a3057e0f..d5afe08e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: @@ -32,7 +32,7 @@ jobs: args: build --clean --snapshot --single-target - name: Store artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: cheqd-noded path: dist/linux-amd64_linux_amd64_v1/cheqd-noded @@ -45,7 +45,7 @@ jobs: IMAGE_NAME: ${{ github.repository }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Setup Docker Buildx uses: docker/setup-buildx-action@v3 @@ -79,7 +79,7 @@ jobs: cache-to: type=gha,mode=min - name: Upload Docker build image - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: cheqd-node-build.tar path: /tmp/cheqd-node-build.tar diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index a954d0a9e..b1aa330b4 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -33,7 +33,7 @@ jobs: with: go-version: 1.23 - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: fetch-depth: 0 # Required to fetch version diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 244b11717..fcd271337 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: name: "Shell pipefail check" runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Run 'set -euox pipefail' check run: bash ./.github/scripts/ensure_set_euox_pipefail.sh @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Run Markdown link check uses: gaurav-nelson/github-action-markdown-link-check@v1 @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: @@ -45,16 +45,16 @@ jobs: cache: false # temporarily off, as golangci-lint doesn't align 100% with cached setup-go@v4, see: https://github.com/golangci/golangci-lint-action/issues/807 - name: Run golangci-lint - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@v9 with: - version: v1.60.3 + version: v2.7.2 args: --config .github/linters/.golangci.yaml proto-lint: name: "Protobuf" runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 # Install the `buf` CLI - uses: bufbuild/buf-setup-action@v1.50.0 @@ -78,7 +78,7 @@ jobs: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: fetch-depth: 0 # Required to fetch version diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 06939f7bf..7af2a00f4 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: amannn/action-semantic-pull-request@v5.5.3 env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index beec4c9eb..7c7d84f61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: fetch-depth: 0 # Required to fetch version @@ -50,7 +50,7 @@ jobs: EXECUTE_RELEASE: ${{ steps.execute-release.outputs.EXECUTE_RELEASE }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: fetch-depth: 0 # Required to fetch version persist-credentials: false @@ -105,7 +105,7 @@ jobs: if: needs.release-guard.outputs.EXECUTE_RELEASE == 'true' steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: fetch-depth: 0 # Required to fetch version persist-credentials: false @@ -155,7 +155,7 @@ jobs: runs-on: ubuntu-24.04-arm steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: persist-credentials: false @@ -185,7 +185,7 @@ jobs: IMAGE_NAME: ${{ github.repository }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: persist-credentials: false diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 47fcb96db..3e655989d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: DEFAULT_DEBUG_BRANCH: ${{ github.ref_name }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: "Modify runner's home directory permissions" run: "sudo chmod 755 /home/runner" @@ -52,7 +52,7 @@ jobs: PYTHONDEVMODE: 1 DEFAULT_DEBUG_BRANCH: ${{ github.ref_name }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: "Modify runner's home directory permissions" run: "sudo chmod 755 /home/runner" @@ -82,7 +82,7 @@ jobs: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: @@ -98,7 +98,7 @@ jobs: run: ginkgo -r --race --randomize-all --randomize-suites --keep-going --trace --junit-report report-unit.xml - name: Upload unit tests result - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: report-unit.xml path: report-unit.xml @@ -108,10 +108,10 @@ jobs: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Download binary artifact - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v7 id: download with: name: cheqd-noded @@ -121,7 +121,7 @@ jobs: run: sudo chmod +x ${{ env.RUNNER_BIN_DIR }}/cheqd-noded - name: Download node Docker image - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v7 with: name: cheqd-node-build.tar @@ -165,7 +165,7 @@ jobs: run: docker compose --env-file build-latest.env logs --tail --follow - name: Upload integration tests result - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: report-integration.xml path: report-integration.xml @@ -174,7 +174,7 @@ jobs: name: "Fee Abstraction Tests" runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Execute fee-abstraction logic by paying in `uosmo` working-directory: ./tests/fee-abs @@ -184,7 +184,7 @@ jobs: name: "Upgrade Tests" runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Download old node binary (mainnet-latest) run: | @@ -212,7 +212,7 @@ jobs: run: go install github.com/onsi/ginkgo/v2/ginkgo@latest - name: Download new version of the Docker image (build-latest) - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v7 with: name: cheqd-node-build.tar @@ -230,7 +230,7 @@ jobs: ginkgo -r --race --tags upgrade_integration --focus-file pre_test.go --keep-going --trace --junit-report ../../../../report-pre-upgrade.xml - name: Upload pre-upgrade tests result - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: report-pre-upgrade.xml path: report-pre-upgrade.xml @@ -251,7 +251,7 @@ jobs: ginkgo -r --race --tags upgrade_integration --focus-file pre_upgrade_v4_1_test.go --keep-going --trace --junit-report ../../../../report-pre-upgrade-v4_1.xml - name: Upload pre-upgrade-v4_1 tests result - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: report-pre-upgrade-v4_1.xml path: report-pre-upgrade-v4_1.xml @@ -272,7 +272,7 @@ jobs: ginkgo -r --race --tags upgrade_integration --focus-file pre_upgrade_v4_2_test.go --keep-going --trace --junit-report ../../../../report-pre-upgrade-v4_2.xml - name: Upload pre-upgrade-v4_2 tests result - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: report-pre-upgrade-v4_2.xml path: report-pre-upgrade-v4_2.xml @@ -288,7 +288,7 @@ jobs: docker ps -a - name: Download binary artifact (build-latest) - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v7 id: download with: name: cheqd-noded @@ -303,7 +303,7 @@ jobs: ginkgo -r --race --tags upgrade_integration --focus-file post_test.go --keep-going --trace --junit-report ../../../../report-post-upgrade.xml - name: Upload post-upgrade tests result - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: report-post-upgrade.xml path: report-post-upgrade.xml @@ -314,7 +314,7 @@ jobs: ginkgo -r --tags integration --race --randomize-suites --keep-going --trace --skip-file cli_defi_test.go --skip-file cli_defi_negative_test.go --junit-report ../../report-upgraded-integration.xml - name: Upload post-upgrade integration tests result - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: report-upgraded-integration.xml path: report-upgraded-integration.xml @@ -330,7 +330,7 @@ jobs: ginkgo -r --race --tags upgrade_integration --focus-file param_change_proposal_test.go --keep-going --trace --junit-report ../../../../report-pricing-proposal.xml - name: Upload pricing proposal tests result - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: report-pricing-proposal.xml path: report-pricing-proposal.xml @@ -341,7 +341,7 @@ jobs: ginkgo -r --tags integration --race --randomize-suites --keep-going --trace --skip-file cli_diddoc_test.go --skip-file cli_diddoc_negative_test.go --skip-file cli_resource_test.go --skip-file cli_resource_negative_test.go --skip-file cli_defi_test.go --skip-file cli_defi_negative_test.go --junit-report ../../report-pricing-change.xml - name: Upload pricing change tests result - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: report-pricing-change.xml path: report-pricing-change.xml @@ -360,39 +360,39 @@ jobs: if: always() steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Download unit test - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v7 with: name: report-unit.xml - name: Download integration test report - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v7 with: name: report-integration.xml - name: Download pre-upgrade test Report - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v7 with: name: report-pre-upgrade.xml - name: Download post-upgrade test Report - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v7 with: name: report-post-upgrade.xml - name: Download upgraded integration test Report - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v7 with: name: report-upgraded-integration.xml - name: Download pricing proposal test Report - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v7 with: name: report-pricing-proposal.xml - name: Download pricing change test Report - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v7 with: name: report-pricing-change.xml - name: Combine test results From 10157204cacccddcac1453cbe896717dc8bfcd93 Mon Sep 17 00:00:00 2001 From: kaustubhkapatral Date: Wed, 7 Jan 2026 15:18:37 +0530 Subject: [PATCH 2/2] revert golang-linter version --- .github/linters/.golangci.yaml | 40 ++++++++++++++++++++-------------- .github/workflows/lint.yml | 4 ++-- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/.github/linters/.golangci.yaml b/.github/linters/.golangci.yaml index 2575a1bc5..c1f372bea 100644 --- a/.github/linters/.golangci.yaml +++ b/.github/linters/.golangci.yaml @@ -1,5 +1,3 @@ -version: "2" - run: timeout: 10m go: "1.23" @@ -8,12 +6,15 @@ linters: enable: - bodyclose - copyloopvar - # - depguard # Disabled - no import restrictions applied earlier + - depguard - dogsled - errcheck - goconst - gocritic - # - gosimple # Merged into staticcheck in v2 + - gofumpt + - gofmt + - goimports + - gosimple - govet - ineffassign - misspell @@ -21,16 +22,16 @@ linters: - nestif - nolintlint - staticcheck - # - stylecheck # Merged into staticcheck in v2 - # - typecheck # Removed in v2 + - stylecheck + - typecheck - unconvert - unused - -formatters: - enable: - - gofumpt - - goimports - + +issues: + exclude-rules: + - text: "ST1003:" + linters: + - stylecheck linters-settings: dogsled: @@ -45,16 +46,14 @@ linters-settings: disabled-checks: - regexpMust - badCall # Remove this after CI workflow PR - + misspell: ignore-words: - cheqd - cheq - ncheq - staticcheck: - # Select the Go version to target. - go: "1.23" + stylecheck: # STxxxx checks in https://staticcheck.io/docs/configuration/options/#checks # Default: ["*"] checks: ["all"] @@ -65,7 +64,16 @@ linters-settings: # https://staticcheck.io/docs/configuration/options/#initialisms initialisms: ["ACL", "API", "ASCII", "CPU", "CSS", "DNS", "EOF", "GUID", "HTML", "HTTP", "HTTPS", "ID", "IP", "JSON", "QPS", "RAM", "RPC", "SLA", "SMTP", "SQL", "SSH", "TCP", "TLS", "TTL", "UDP", "UI", "GID", "UID", "UUID", "URI", "URL", "UTF8", "VM", "XML", "XMPP", "XSRF", "XSS", "SIP", "RTP", "AMQP", "DB", "TS"] + depguard: + rules: + main: + files: + - $all + list-mode: lax + allow: "*" + goconst: min-occurrences: 5 ignore-tests: true ignore-strings: "echo '" + \ No newline at end of file diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fcd271337..f86b6ff76 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -45,9 +45,9 @@ jobs: cache: false # temporarily off, as golangci-lint doesn't align 100% with cached setup-go@v4, see: https://github.com/golangci/golangci-lint-action/issues/807 - name: Run golangci-lint - uses: golangci/golangci-lint-action@v9 + uses: golangci/golangci-lint-action@v6 with: - version: v2.7.2 + version: v1.60.3 args: --config .github/linters/.golangci.yaml proto-lint: