Merge branch 'master' into dependabot/github_actions/actions/setup-py…

…thon-5
clouddrove · Dec 27, 2023 · 7270c2e · 7270c2e
2 parents 0210fcb + e20898e
commit 7270c2e
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/.github/workflows/auto_assignee.yml b/.github/workflows/auto_assignee.yml
@@ -1,3 +1,4 @@
+---
 name: Auto Assign PRs
 
 on:
@@ -7,8 +8,9 @@ on:
   workflow_dispatch:
 jobs:
   assignee:
-    uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@1.0.9
     secrets:
       GITHUB: ${{ secrets.GITHUB }}
     with:
       assignees: 'clouddrove-ci'
+...
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/changelog.yml b/.github/workflows/changelog.yml
@@ -1,3 +1,4 @@
+---
 name: changelog
 permissions: write-all
 on:
@@ -7,7 +8,8 @@ on:
   workflow_dispatch:
 jobs:
   changelog:
-    uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@1.0.9
     secrets: inherit
     with:
       branch: 'master'
+...
diff --git a/.github/workflows/tf-checks.yml b/.github/workflows/tf-checks.yml
@@ -1,3 +1,4 @@
+---
 name: tf-checks
 on:
   push:
@@ -6,15 +7,16 @@ on:
   workflow_dispatch:
 jobs:
   basic_example:
-    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.9
     with:
       working_directory: './_example/basic/'
   complete_example:
-    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.9
     with:
       working_directory: './_example/complete/'
   spot_instance:
-    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.9
     with:
       working_directory: './_example/spot_instance/'
+...
 
diff --git a/.github/workflows/tflint.yml b/.github/workflows/tflint.yml
@@ -1,3 +1,4 @@
+---
 name: tf-lint
 on:
   push:
@@ -6,6 +7,7 @@ on:
   workflow_dispatch:
 jobs:
   tflint:
-    uses: clouddrove/test-tfsec/.github/workflows/tflint.yaml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/[email protected]
     secrets:
       GITHUB: ${{ secrets.GITHUB }}
+...
diff --git a/.github/workflows/tfsec.yml b/.github/workflows/tfsec.yml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
 jobs:
   tfsec:
-    uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@1.0.9
     secrets: inherit
     with:
       working_directory: '.'