Sync files with networkservicemesh/cmd-template

networkservicemesh · Jul 25, 2022 · 573bb90 · 573bb90
1 parent 9610e21
commit 573bb90
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/automerge.yaml b/.github/workflows/automerge.yaml
@@ -7,6 +7,12 @@ on:
     workflows:
       - "ci"
 jobs:
+  print-debug-info:
+    name: Print debug info
+    runs-on: ubuntu-latest
+    steps:
+      - uses: hmarr/debug-action@v2
+
   check-mergeability:
     if: ${{ github.event.workflow_run.conclusion == 'success' && github.actor == 'nsmbot' }}
     uses: networkservicemesh/.github/.github/workflows/check-mergeability.yaml@main
@@ -15,6 +21,7 @@ jobs:
 
   automerge:
     needs: [check-mergeability]
+    if: ${{ needs.check-mergeability.result == 'success' }}
     uses: networkservicemesh/.github/.github/workflows/automerge.yaml@main
 
   resolve_conflicts:

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -39,4 +39,4 @@ jobs:
     if: github.repository != 'networkservicemesh/cmd-template'
     uses: networkservicemesh/.github/.github/workflows/docker-build-and-test.yaml@main
     secrets:
-      token: ${{ github.token }}
+      token: ${{ secrets.GITHUB_TOKEN }}