diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aee5c36b..f1a463dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,9 +7,9 @@ on: pull_request: jobs: - linters: - name: Linters - uses: ./.github/workflows/linters.yml + trunk: + name: Trunk + uses: ./.github/workflows/trunk-check.yml submodules: name: Compile Kakarot contracts diff --git a/.github/workflows/kakarot.yml b/.github/workflows/kakarot.yml index 09e17b31..f78b45f1 100644 --- a/.github/workflows/kakarot.yml +++ b/.github/workflows/kakarot.yml @@ -3,6 +3,12 @@ name: Kakarot compilation caching on: workflow_call: +permissions: read-all + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: submodules: runs-on: ubuntu-latest diff --git a/.github/workflows/trunk-check.yaml b/.github/workflows/trunk-check.yaml index 327024da..4a3233d7 100644 --- a/.github/workflows/trunk-check.yaml +++ b/.github/workflows/trunk-check.yaml @@ -1,10 +1,7 @@ name: Trunk on: - push: - branches: [main] - pull_request: - branches: [main] + workflow_call: concurrency: group: ${{ github.workflow }}-${{ github.ref }}