Merge pull request #53 from Psypher1/learn-data

updates to workflow stuff
Psypher1 · Dec 18, 2023 · 2a41900 · 2a41900
2 parents 92e9e98 + b5ca05a
commit 2a41900
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -31,7 +31,3 @@ accessibility is impacted and tested._
 - [ ] 👍 yes
 - [ ] 🙅 no, because they aren't needed
 - [ ] 🙋 no, because I need help
-
-## [optional] Are there any post deployment tasks we need to perform?
-
-## [optional] What gif best describes this PR or how it makes you feel?
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -1,22 +1,36 @@
 # This workflow deploys The Language Hub on a successful PR
-name: CI
+name: auto-merge
 
-# Controls when the action will run. Triggers the workflow on push or pull request events
 on:
   pull_request:
-    branches: [learn-data]
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  merge:
-    # The type of runner that the job will run on
+  auto-merge:
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - uses: actions/checkout@v2
-        with: ${{ secrets.ADMIN_GITHUB_TOKEN }}
-      - uses: ahmadnassri/action-dependabot-auto-merge@v2.6.6
+      - uses: ahmadnassri/action-dependabot-auto-merge@v2
         with:
-          target: patch
-          token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+          target: minor
+          github-token: ${{ secrets.ADMIN_GITHUB_TOKEN  }}
+# name: CI
+
+# # Controls when the action will run. Triggers the workflow on push or pull request events
+# on:
+#   pull_request:
+#     branches: [learn-data]
+
+# # A workflow run is made up of one or more jobs that can run sequentially or in parallel
+# jobs:
+#   merge:
+#     # The type of runner that the job will run on
+#     runs-on: ubuntu-latest
+
+#     # Steps represent a sequence of tasks that will be executed as part of the job
+#     steps:
+#       - uses: actions/checkout@v2
+#         with: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+#       - uses: ahmadnassri/action-dependabot-auto-merge@v2.6.6
+#         with:
+#           target: patch
+#           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}