diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a150a26633..d778d26d05f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,23 +7,9 @@ concurrency: cancel-in-progress: true jobs: - lint_code: - name: 'Lint Code' - uses: ./.github/workflows/lint-code.yml - - lint_commits: - name: 'Lint Commits' - if: ${{ github.event_name == 'pull_request' }} - uses: ./.github/workflows/lint-commits.yml - # CI matrix - runs the job in lagom-template.yml with different configurations. Lagom: - needs: [lint_code, lint_commits] - if: | - always() - && github.repository == 'LadybirdBrowser/ladybird' - && needs.lint_code.result == 'success' - && (needs.lint_commits.result == 'skipped' || needs.lint_commits.result == 'success') + if: github.repository == 'LadybirdBrowser/ladybird' strategy: fail-fast: false diff --git a/.github/workflows/lint-code.yml b/.github/workflows/lint-code.yml index 964b320e87c..ca901dba922 100644 --- a/.github/workflows/lint-code.yml +++ b/.github/workflows/lint-code.yml @@ -1,7 +1,6 @@ name: Lint Code -# Used by ci.yml -on: [workflow_call] +on: [ push, pull_request ] jobs: lint: diff --git a/.github/workflows/lint-commits.yml b/.github/workflows/lint-commits.yml index 12e359ac298..e27b511ccae 100644 --- a/.github/workflows/lint-commits.yml +++ b/.github/workflows/lint-commits.yml @@ -1,7 +1,6 @@ name: Lint Commit Messages -# Used by ci.yml -on: [workflow_call] +on: [pull_request_target] # Make sure to update Meta/lint-commit.sh to match this script when adding new checks! # (… but don't accept overlong 'fixup!' commit descriptions.)