diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 866eef9635a..410512feae3 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -14,10 +14,9 @@ name: "CodeQL" on: push: branches: [ "mealie-next" ] - pull_request: - branches: [ "mealie-next" ] schedule: - cron: '36 9 * * 3' + workflow_call: jobs: analyze: diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index cda1274478e..48d0208112c 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -1,8 +1,7 @@ name: E2E Tests on: - pull_request: - branches: - - mealie-next + workflow_call: + jobs: test: timeout-minutes: 60 diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml index d6d9cfdbe5c..ad2fa13e3d2 100644 --- a/.github/workflows/pull-requests.yml +++ b/.github/workflows/pull-requests.yml @@ -5,6 +5,10 @@ on: branches: - mealie-next +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number }} + cancel-in-progress: true + jobs: pull-request-lint: name: "Lint PR" @@ -21,3 +25,15 @@ jobs: container-scanning: name: "Trivy Container Scanning" uses: ./.github/workflows/partial-trivy-container-scanning.yml + + end-to-end: + name: "End-to-End Tests" + uses: ./.github/workflows/e2e.yml + + code-ql: + name: "CodeQL" + uses: ./.github/workflows/codeql.yml + permissions: + actions: read + contents: read + security-events: write