Merge branch 'master' of github.com:clouddrove/terraform-aws-eks-addo…

…ns into feat/prom_jaeger
clouddrove · Dec 29, 2023 · 5bb32b5 · 5bb32b5
2 parents 29b7a92 + c353265
commit 5bb32b5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -0,0 +1,12 @@
+---
+name: Auto merge
+on:
+  pull_request:
+jobs:
+  auto-merge:
+    uses: clouddrove/github-shared-workflows/.github/workflows/[email protected]
+    secrets:
+      GITHUB: ${{ secrets.GITHUB }}
+    with:
+      tfcheck: 'tf-checks-complete-example / Check code format'
+...
diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml
@@ -28,7 +28,7 @@ jobs:
           token: ${{ env.GH_TOKEN }}
 
       - name: 'Set up Python 3.7'
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'