DX-208 <remove require option> (#108)

* DX-208 <remove require option> * formatting fix --------- Co-authored-by: Gerson Trujillo <[email protected]>
urbansportsclub · Apr 23, 2024 · 11650af · 11650af
1 parent 3b050f9
commit 11650af
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 35 deletions.
diff --git a/.github/workflows/automerge-dependabot-with-codeowners.yml b/.github/workflows/automerge-dependabot-with-codeowners.yml
@@ -1,7 +1,7 @@
 ---
 name: Auto-merge dependabot PR's
 
-on: 
+on:
   workflow_call:
     secrets:
       github-token:
@@ -19,22 +19,22 @@ jobs:
     if: ${{ github.actor == 'dependabot[bot]' }}
 
     steps:
-    - name: Dependabot metadata
-      id: dependabot-metadata
-      uses: dependabot/[email protected]
-      with:
-        github-token: "${{ secrets.github-token }}"
-  
-    - name: Check PR checks
-      run: |
+      - name: Dependabot metadata
+        id: dependabot-metadata
+        uses: dependabot/[email protected]
+        with:
+          github-token: "${{ secrets.github-token }}"
+
+      - name: Check PR checks
+        run: |
           PR_URL="${{ github.event.pull_request.html_url }}"
-          gh pr checks $PR_URL --required --watch --fail-fast > /dev/null
-      env:
-        GITHUB_TOKEN: ${{ secrets.github-token }}
+          gh pr checks $PR_URL --watch --fail-fast > /dev/null
+        env:
+          GITHUB_TOKEN: ${{ secrets.github-token }}
 
-    - name: Enable auto-merge for Dependabot PRs
-      if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}
-      run: gh pr merge --auto --squash --admin "$PR_URL"
-      env:
-        PR_URL: ${{ github.event.pull_request.html_url }}
-        GITHUB_TOKEN: ${{ secrets.github-token }}
+      - name: Enable auto-merge for Dependabot PRs
+        if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}
+        run: gh pr merge --auto --squash --admin "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GITHUB_TOKEN: ${{ secrets.github-token }}
diff --git a/.github/workflows/automerge-dependabot.yml b/.github/workflows/automerge-dependabot.yml
@@ -1,7 +1,7 @@
 ---
 name: Auto-merge dependabot PR's
 
-on: 
+on:
   workflow_call:
     secrets:
       github-token:
@@ -19,21 +19,21 @@ jobs:
     if: ${{ github.actor == 'dependabot[bot]' }}
 
     steps:
-    - name: Dependabot metadata
-      id: dependabot-metadata
-      uses: dependabot/[email protected]
-      with:
-        github-token: "${{ secrets.github-token }}"
+      - name: Dependabot metadata
+        id: dependabot-metadata
+        uses: dependabot/[email protected]
+        with:
+          github-token: "${{ secrets.github-token }}"
 
-    - name: Approve a PR
-      run: gh pr review --approve "$PR_URL"
-      env:
-        PR_URL: ${{ github.event.pull_request.html_url }}
-        GITHUB_TOKEN: ${{ secrets.github-token }}
+      - name: Approve a PR
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GITHUB_TOKEN: ${{ secrets.github-token }}
 
-    - name: Enable auto-merge for Dependabot PRs
-      if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}
-      run: gh pr merge --auto --squash "$PR_URL"
-      env:
-        PR_URL: ${{ github.event.pull_request.html_url }}
-        GITHUB_TOKEN: ${{ secrets.github-token }}
+      - name: Enable auto-merge for Dependabot PRs
+        if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' && github.event.pull_request.check_suite.conclusion == 'success' }}
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GITHUB_TOKEN: ${{ secrets.github-token }}
diff --git a/.gitignore b/.gitignore
@@ -348,3 +348,6 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
+
+# intellij settings folder
+.idea/