Merge pull request #457 from gravitl/NET-1518

Updated testdeploybranch and terraform to have a manual trigger

Author: lmnzx

.DS_Store

@@ -52,6 +52,8 @@ jobs:
     - name: Quick Check
       id: quickcheck
       run: |
+        echo "netmakerbranch: ${{ inputs.netmakerbranch }}"
+        echo "netclientbranch: ${{ inputs.netclientbranch }}"
         wget -O nm-quick-develop.sh https://raw.githubusercontent.com/gravitl/netmaker/develop/scripts/nm-quick.sh
         wget -O nm-quick-branch.sh https://raw.githubusercontent.com/gravitl/netmaker/${{ inputs.netmakerbranch }}/scripts/nm-quick.sh
         diff ./nm-quick-develop.sh ./nm-quick-branch.sh > output.txt || echo "There is a difference between the two files"  > output.txt

.github/workflows/terraform.yml

@@ -84,7 +84,7 @@ jobs:
     uses: ./.github/workflows/terraform.yml
     with:
       netclientbranch: ${{ inputs.netclientbranch }}
-      netmakerbranch: ${{ inputs.netmakerbranch }}
+      netmakerbranch: ${{ github.event_name == 'workflow_dispatch' && inputs.branch || github.head_ref }}
       server: ${{ needs.getserver.outputs.server }}
     secrets: inherit