Merge pull request #110 from Azure/gb-betterbicepbuild

Stopping bicep build in main branch post merge

Author: Gordon Byers

.github/workflows/bicepBuild.yml

@@ -7,11 +7,15 @@ on:
     paths: 
       - 'bicep/*'
       - ".github/workflows/bicepBuild.yml"
+    branches-ignore: main
+    
+  pull_request:
+    branches: main
 
   workflow_dispatch:
 
 jobs:
-  build:
+  Validation:
     runs-on: ubuntu-latest
 
     steps:
@@ -42,13 +46,27 @@ jobs:
 
           /home/runner/.azure/bin/bicep build bicep/main.bicep --outdir $compiledir
 
-      - name: ContextCheck
+      - name: Git diff
         shell: pwsh
+        id: isGitDiff
         run: |
-          cd bicep/compiled
-          dir
+          $diff=git diff --shortstat
+          
+          if ($null -eq $diff) {
+            write-output "No difference in compiled bicep to commit"
+            echo "::set-output name=GITDIFF::false" #outputting for condition
+          }
+          else {
+            write-output "There are differences in compiled bicep to commit"
+            echo "::set-output name=GITDIFF::true" #outputting for condition
+          }
+          
+      - name: Debug
+        run: |
+          echo "gitdiff is ${{ steps.isGitDiff.outputs.GITDIFF}}"
           
       - name: GIT Push Json file
+        if: steps.isGitDiff.outputs.GITDIFF==true
         uses: actions-x/commit@v2
         with:
           message: Adding auto compiled bicep json

bicep/compiled/main.json

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.4.1008.15138",
-      "templateHash": "5512021043181041758"
+      "templateHash": "15343024568483163339"
     }
   },
   "parameters": {
@@ -2202,6 +2202,10 @@
       "type": "string",
       "value": "[if(parameters('createKV'), variables('akvName'), '')]"
     },
+    "keyVaultId": {
+      "type": "string",
+      "value": "[if(parameters('createKV'), resourceId('Microsoft.KeyVault/vaults', variables('akvName')), '')]"
+    },
     "containerRegistryName": {
       "type": "string",
       "value": "[if(not(empty(parameters('registries_sku'))), variables('acrName'), '')]"