Fix Windows MSI Build Step (#752)

Author: james-bebbington

.circleci/config.yml

@@ -27,7 +27,6 @@ commands:
     parameters:
       files:
         type: string
-        # TODO: Add dist/otel-collector-*amd64.msi back
         default: |
             bin/otelcontribcol_darwin_amd64
             bin/otelcontribcol_linux_arm64
@@ -37,6 +36,7 @@ commands:
             dist/otel-contrib-collector_*_amd64.deb
             dist/otel-contrib-collector-*.x86_64.rpm
             dist/otel-contrib-collector_*_arm64.deb
+            dist/otel-contrib-collector-*amd64.msi
     steps:
       - run:
           name: Check if files exist
@@ -192,13 +192,20 @@ workflows:
           filters:
             tags:
               only: /.*/
+      - windows-msi:
+          requires:
+            - cross-compile
+          filters:
+            tags:
+              only: /.*/
       - publish-check:
           requires:
             - lint
             - unit-tests
             - integration-tests
             - cross-compile
             - loadtest
+            - windows-msi
             - deb-package
             - rpm-package
       - publish-stable:
@@ -208,6 +215,7 @@ workflows:
             - integration-tests
             - cross-compile
             - loadtest
+            - windows-msi
             - deb-package
             - rpm-package
           filters:

internal/buildscripts/packaging/msi/make.ps1

@@ -17,7 +17,7 @@
     Makefile like build commands for the Collector on Windows.
     
     Usage:   .\make.ps1 <Command> [-<Param> <Value> ...]
-    Example: .\make.ps1 New-MSI -Config "./my-config.yaml"
+    Example: .\make.ps1 New-MSI -Config "./my-config.yaml" -Version "v0.0.2"
 .PARAMETER Target
     Build target to run (Install-Tools, New-MSI)
 #>
@@ -28,6 +28,12 @@ Param(
 $ErrorActionPreference = "Stop"
 
 function Install-Tools {
+    # disable progress bar support as this causes CircleCI to crash
+    $OriginalPref = $ProgressPreference
+    $ProgressPreference = "SilentlyContinue"
+    Install-WindowsFeature Net-Framework-Core
+    $ProgressPreference = $OriginalPref
+
     choco install wixtoolset -y
     setx /m PATH "%PATH%;C:\Program Files (x86)\WiX Toolset v3.11\bin"
     refreshenv