fix(ci): address errors in CI to enable branch protection rules (#30)

* fix(ci): add required version to docker lint * chore: add merge group to CI triggers * fix(ci): fix misspelling in filename
rollkit · Sep 9, 2024 · 75ff206 · 75ff206
1 parent 269d005
commit 75ff206
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/docker-build-publish.yml b/.github/workflows/docker-build-publish.yml
@@ -8,6 +8,7 @@ on:
     tags:
       - "v*"
   pull_request:
+  merge_group:
 
 jobs:
   docker-build:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -43,6 +43,6 @@ jobs:
       - uses: rollkit/.github/.github/actions/[email protected]
 
   dockerfile-lint:
-    uses: rollkit/.github/.github/workflows/reuseable_dockerfile_lint.yml
+    uses: rollkit/.github/.github/workflows/reusable_dockerfile_lint.yml@v0.4.1
     with:
       failure-threshold: "error"
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ on: @@
         tags:
           - "v*"
       pull_request:
+      merge_group:
     jobs:
       docker-build:
@@ Expand Down @@