SCAN4NET-955 Remove the embedded scanner-cli.jar (#2875)

Co-authored-by: Tim Pohlmann <tim.pohlmann@sonarsource.com>

Author: martin-strecker-sonarsource

scripts/package-artifacts.ps1

@@ -30,7 +30,9 @@
     Copy-Item -Path "$PSScriptRoot\..\LICENSE.txt" -Destination $DestinationLicenses
     Copy-Item -Path "$PSScriptRoot\..\Licenses\THIRD_PARTY_LICENSES\*" -Destination $DestinationThirdPartyLicenses
 
-    Expand-Archive -Path "$scannerCliDownloadDir\$scannerCliArtifact" -DestinationPath $Destination -Force
+    if ($scannerCliEmbed) {
+        Expand-Archive -Path "$scannerCliDownloadDir\$scannerCliArtifact" -DestinationPath $Destination -Force
+    }
 
     if ($SignAssemblies) {
         Sign-Assemblies -Pattern "$Destination\Sonar*" -TargetName ".NET Framework assemblies"
@@ -75,7 +77,9 @@ function Package-NetScanner {
     Copy-Item -Path "$PSScriptRoot\..\Licenses\THIRD_PARTY_LICENSES\Newtonsoft.Json-LICENSE.txt" -Destination $DestinationThirdPartyLicenses
     Copy-Item -Path "$PSScriptRoot\..\Licenses\THIRD_PARTY_LICENSES\SharpZipLib-LICENSE.txt" -Destination $DestinationThirdPartyLicenses
 
-    Expand-Archive -Path "$scannerCliDownloadDir\$scannerCliArtifact" -DestinationPath $Destination -Force
+    if ($scannerCliEmbed) {
+        Expand-Archive -Path "$scannerCliDownloadDir\$scannerCliArtifact" -DestinationPath $Destination -Force
+    }
 
     if ($SignAssemblies) {
         Sign-Assemblies -Pattern "$Destination\Sonar*" -TargetName ".NET assemblies"

scripts/variables.ps1

@@ -1,4 +1,5 @@
 $fullBuildOutputDir = "$PSScriptRoot\..\build"
+$scannerCliEmbed = $false
 $scannerCliVersion = "5.0.2.4997"
 $scannerCliAssemblyName = "sonar-scanner-cli-$ScannerCliVersion"
 $scannerCliArtifact = "$scannerCliAssemblyName.zip"

templates/unix-qa-stage.yml

@@ -49,7 +49,9 @@ stages:
             - powershell: $(Build.SourcesDirectory)/scripts/ci-self-signed-certificate.ps1
               displayName: "Create self-signed certificate"
             # On Linux/MacOS we need to update the execution permissions for the ScannerCLI
-            - script: chmod -R +x $(Build.SourcesDirectory)/build/sonarscanner-net/sonar-scanner-*/bin
+            - script: |
+                chmod -R +x $(Build.SourcesDirectory)/build/sonarscanner-net/sonar-scanner-*/bin
+                exit 0 # Always return 0; chmod fails when the scanner-cli is not present.
               name: scannerPermissions
               displayName: "Update Scanner permissions"
           matrix: