fix ci rebase

kkrt-labs · Oct 3, 2023 · 6e3b4f5 · 6e3b4f5
1 parent b0f27c9
commit 6e3b4f5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git 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
@@ -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
@@ -1,10 +1,7 @@
 name: Trunk
 
 on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
+  workflow_call:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}