diff --git a/.github/workflows/codeql-reusable.yml b/.github/workflows/codeql-analysis.yml similarity index 91% rename from .github/workflows/codeql-reusable.yml rename to .github/workflows/codeql-analysis.yml index b43289a2520..60815e9595a 100644 --- a/.github/workflows/codeql-reusable.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,13 +2,15 @@ # SPDX-License-Identifier: Apache-2.0 --- +name: CodeQL Analysis + on: - workflow_call: - inputs: - golang_version: - type: string - required: false - default: "1.19" + push: + branches: ["main"] + pull_request: + branches: ["main"] + schedule: + - cron: "0 5 * * *" jobs: analyze: @@ -36,7 +38,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: ${{ inputs.golang_version }} + go-version: 1.19 if: ${{ matrix.language == 'go' }} # Initializes the CodeQL tools for scanning. diff --git a/.github/workflows/codeql-scheduled.yml b/.github/workflows/codeql-scheduled.yml deleted file mode 100644 index ea33c27e013..00000000000 --- a/.github/workflows/codeql-scheduled.yml +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 2022 the Kubeapps contributors -# SPDX-License-Identifier: Apache-2.0 - ---- -name: "CodeQL" - -on: - schedule: - - cron: "0 5 * * *" - workflow_dispatch: - -jobs: - CodeQL: - uses: ./.github/workflows/codeql-reusable.yml diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 953999a57ca..47aa79af4d3 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -47,8 +47,3 @@ jobs: - uses: actions/checkout@v3 - name: Check license Headers uses: apache/skywalking-eyes/header@v0.4.0 - - CodeQL: - uses: ./.github/workflows/codeql-reusable.yml - with: - golang_version: ${{ inputs.golang_version }}