Fixing conditions on matrix parameter, again.

Azure · Nov 8, 2019 · cc21e5c · cc21e5c
1 parent 4c09ece
commit cc21e5c
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/tools/templates/iiot_deployment.yml b/tools/templates/iiot_deployment.yml
@@ -11,15 +11,12 @@ jobs:
       windows:
         poolName: 'Hosted Windows 2019 with VS2019'
         runtime: win-x64
-        exeSuffix: '.exe'
       linux:
         poolName: 'Hosted Ubuntu 1604'
         runtime: linux-x64
-        exeSuffix: ''
       macOS:
         poolName: 'Hosted macOS'
         runtime: osx-x64
-        exeSuffix: ''
   pool:
     name: $(poolName)
   steps:
@@ -44,27 +41,29 @@ jobs:
       projects: 'deploy/src/Microsoft.Azure.IIoT.Deployment/Microsoft.Azure.IIoT.Deployment.csproj'
       arguments: '--runtime $(runtime) --configuration Release -p:PublishSingleFile=true --self-contained --output $(Build.ArtifactStagingDirectory)/$(runtime)'
       zipAfterPublish: false
-  - ${{ if eq('$(runtime)', 'win-x64') }}:
-    - task: AntiMalware@3
-      displayName: 'Run Virus scan'
-      inputs:
-        InputType: 'Basic'
-        ScanType: 'CustomScan'
-        # FileDirPath: '$(Build.StagingDirectory)'
-        FileDirPath: '$(Build.ArtifactStagingDirectory)'
-        EnableServices: true
-        SupportLogOnError: false
-        TreatSignatureUpdateFailureAs: 'Warning'
-        SignatureFreshness: 'UpToDate'
-        TreatStaleSignatureAs: 'Error'
+  # - ${{ if eq(parameters.runtime, 'win-x64') }}:
+  - task: AntiMalware@3
+    displayName: 'Run Virus scan'
+    condition: eq('$(runtime)', 'win-x64')
+    inputs:
+      InputType: 'Basic'
+      ScanType: 'CustomScan'
+      # FileDirPath: '$(Build.StagingDirectory)'
+      FileDirPath: '$(Build.ArtifactStagingDirectory)'
+      EnableServices: true
+      SupportLogOnError: false
+      TreatSignatureUpdateFailureAs: 'Warning'
+      SignatureFreshness: 'UpToDate'
+      TreatStaleSignatureAs: 'Error'
   - ${{ if and(eq(parameters.sign, 'True'), eq('$(runtime)', 'win-x64')) }}:
     - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
       displayName: 'Executable Signing'
+      # condition: and(eq('$(parameters.sign)', 'True'), eq('$(runtime)', 'win-x64'))
       inputs:
         ConnectedServiceName: 'Code Signing Certificate'
         # FolderPath: '$(Agent.BuildDirectory)'
         FolderPath: '$(Build.ArtifactStagingDirectory)'
-        Pattern: '**/Microsoft.Azure.IIoT.Deployment/Microsoft.Azure.IIoT.Deployment$(exeSuffix)'
+        Pattern: '**/Microsoft.Azure.IIoT.Deployment/Microsoft.Azure.IIoT.Deployment.exe'
         UseMinimatch: true
         signConfigType: inlineSignParams
         inlineOperation: |
@@ -106,12 +105,13 @@ jobs:
         MaxConcurrency: 1
         MaxRetryAttempts: 50
         VerboseLogin: true
-  - ${{ if ne('$(runtime)', 'win-x64') }}:
-    - task: CmdLine@2
-      displayName: 'Generate MD5 Checksum'
-      inputs:
-        script:  md5sum * > Microsoft.Azure.IIoT.Deployment.md5
-        workingDirectory: $(Build.ArtifactStagingDirectory)/$(runtime)/Microsoft.Azure.IIoT.Deployment
+  # - ${{ if ne('$(runtime)', 'win-x64') }}:
+  - task: CmdLine@2
+    displayName: 'Generate MD5 Checksum'
+    condition: eq('$(runtime)', 'linux-x64')
+    inputs:
+      script:  md5sum * > Microsoft.Azure.IIoT.Deployment.md5
+      workingDirectory: $(Build.ArtifactStagingDirectory)/$(runtime)/Microsoft.Azure.IIoT.Deployment
   - task: ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
   - task: PublishPipelineArtifact@1