From bf5b7319348c79ba17aadb3c359cfd19b59df598 Mon Sep 17 00:00:00 2001 From: aalu1418 <50029043+aalu1418@users.noreply.github.com> Date: Fri, 6 Oct 2023 14:24:55 -0600 Subject: [PATCH] cleanup CI + makefile --- .github/workflows/golangci-lint.yml | 19 ------------------- .github/workflows/sonar-scan.yml | 9 --------- Makefile | 5 ----- 3 files changed, 33 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 63e057028..e67deef94 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -4,25 +4,6 @@ on: pull_request: jobs: - golang_lint_ops: - name: Golang Lint - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - - name: Install Nix - uses: cachix/install-nix-action@29bd9290ef037a3ecbdafe83cbd2185e9dd0fa0a # v20 - with: - nix_path: nixpkgs=channel:nixos-unstable - - name: golangci-lint - run: nix develop -c make lint-go-ops - - name: Store lint report artifact - if: always() - uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 - with: - name: golangci-lint-ops-report - path: ./ops/golangci-lint-ops-report.xml - golang_lint_integration_tests: name: Golang Lint Integration Tests runs-on: ubuntu-latest diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index 89790f897..d976f0ac1 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -52,15 +52,6 @@ jobs: with: fetch-depth: 0 # fetches all history for all tags and branches to provide more metadata for sonar reports - - name: Download Golangci ops reports - uses: dawidd6/action-download-artifact@v2.27.0 - with: - workflow: golangci-lint.yml - workflow_conclusion: "" - name_is_regexp: true - name: golangci-lint-ops-report - if_no_artifact_found: warn - - name: Download Golangci integration tests reports uses: dawidd6/action-download-artifact@v2.27.0 with: diff --git a/Makefile b/Makefile index 998e59554..4df0e3b92 100644 --- a/Makefile +++ b/Makefile @@ -91,11 +91,6 @@ test_ocr_soak: gomodtidy: go mod tidy cd ./integration-tests && go mod tidy - cd ./ops && go mod tidy - -.PHONY: lint-go-ops -lint-go-ops: - cd ./ops && golangci-lint --color=always --exclude=dot-imports --timeout 10m --out-format checkstyle:golangci-lint-ops-report.xml run || true .PHONY: lint-go-integration-tests lint-go-integration-tests: