Revert "[opampsupervisor] Add MSI installer to release artifacts (#1261)" (#1332)

* Revert "[opampsupervisor] Add MSI installer to release artifacts (#1261)"

This reverts commit 8036680

* add changelog

Author: TylerHelmuth

.chloggen/revert-msi-change.yaml

@@ -0,0 +1,26 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: opampsupervisor
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: revert "Add MSI package release artifacts for the OpAMP supervisor (#1261)"
+
+# One or more tracking issues or pull requests related to the change
+issues: [1332]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []
+

.github/workflows/base-binary-release.yaml

@@ -85,11 +85,6 @@ jobs:
       - name: Copy Dockerfile to Collector dependency directory
         run: cp cmd/${{ inputs.binary }}/Dockerfile ${{ inputs.dependency-target-folder }}/cmd/${{ inputs.binary }}/Dockerfile
 
-      - name: Copy MSI files to Core Repo directory
-        run: |
-          cp cmd/${{ inputs.binary }}/opentelemetry.ico ${{ inputs.dependency-target-folder }}/cmd/${{ inputs.binary }}
-          cp cmd/${{ inputs.binary }}/config.windows.example.yaml ${{ inputs.dependency-target-folder }}/cmd/${{ inputs.binary }}
-
       - uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
         with:
           cosign-release: "v2.6.1"

.github/workflows/base-ci-binary.yaml

@@ -22,11 +22,6 @@ on:
         type: boolean
         default: false
         description: "Set to true if linux packages should be uploaded as an artifact"
-      windows-msi:
-        required: false
-        type: boolean
-        default: false
-        description: 'Set to true if windows msi should be uploaded as an artifact'
 
 permissions:
   contents: read
@@ -54,12 +49,6 @@ jobs:
       - name: Copy Dockerfile to Core Repo directory
         run: cp cmd/${{ inputs.binary }}/Dockerfile ${{ inputs.dependency-target-folder }}/cmd/${{ inputs.binary }}/Dockerfile
 
-      - name: Copy MSI files to Core Repo directory
-        if: inputs.windows-msi == true
-        run: |
-          cp cmd/${{ inputs.binary }}/opentelemetry.ico ${{ inputs.dependency-target-folder }}/cmd/${{ inputs.binary }}
-          cp cmd/${{ inputs.binary }}/config.windows.example.yaml ${{ inputs.dependency-target-folder }}/cmd/${{ inputs.binary }}
-
       - uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
         with:
           cosign-release: "v2.6.1"
@@ -77,12 +66,6 @@ jobs:
         with:
           go-version: "~1.25.0"
 
-      - name: Setup wixl # Required to build MSI packages for Windows
-        if: runner.os != 'Windows'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y wixl
-
       - name: Check GoReleaser
         uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
         with:
@@ -113,12 +96,3 @@ jobs:
             dist/*amd64*.deb
             dist/*amd64*.rpm
           if-no-files-found: error
-
-      - name: Upload Windows MSI
-        if: ${{ inputs.windows-msi == true }}
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        with:
-          name: windows-msi
-          path: |
-            dist/msi/**/*.msi
-          if-no-files-found: error

.github/workflows/ci-opampsupervisor.yaml

@@ -38,6 +38,5 @@ jobs:
       collector-dependency: 'open-telemetry/opentelemetry-collector-contrib'
       dependency-target-folder: '.contrib'
       linux-packages: true
-      windows-msi: true
     secrets: inherit
     permissions: write-all

.gitignore

@@ -7,5 +7,3 @@ dist/
 .core
 .contrib
 .tools
-.DS_Store
-.zed

cmd/builder/.goreleaser.yaml

@@ -1,4 +1,3 @@
-# yaml-language-server: $schema=https://goreleaser.com/static/schema-pro.json
 version: 2
 project_name: opentelemetry-collector-releases
 env:

cmd/goreleaser/internal/distro_opamp.go

@@ -33,7 +33,6 @@ var (
 		withBinaryMonorepo(".contrib/cmd/opampsupervisor").
 		withDefaultBinaryRelease(opampReleaseHeader).
 		withDefaultNfpms().
-		withDefaultMSIConfig().
 		// This is required because of some non-obvious path/workdir handling in
 		// Github Actions specific to the binaries CI.
 		withConfigFunc(func(d *distribution) {
@@ -49,9 +48,6 @@ var (
 			d.Nfpms[0].Scripts.PreInstall = path.Join("cmd", d.Name, d.Nfpms[0].Scripts.PreInstall)
 			d.Nfpms[0].Scripts.PostInstall = path.Join("cmd", d.Name, d.Nfpms[0].Scripts.PostInstall)
 			d.Nfpms[0].Scripts.PreRemove = path.Join("cmd", d.Name, d.Nfpms[0].Scripts.PreRemove)
-
-			d.MsiConfig[0].Files = append(d.MsiConfig[0].Files, "config.windows.example.yaml")
-			d.MsiConfig[0].WXS = path.Join("cmd", d.Name, d.MsiConfig[0].WXS)
 		}).
 		withNightlyConfig().
 		build()

cmd/goreleaser/main.go

@@ -25,7 +25,6 @@ func main() {
 	}
 	project := internal.BuildDistribution(*distFlag, *contribBuildOrRestFlag)
 
-	os.Stdout.WriteString("# yaml-language-server: $schema=https://goreleaser.com/static/schema-pro.json\n")
 	e := yaml.NewEncoder(os.Stdout)
 	e.SetIndent(2)
 	if err := e.Encode(&project); err != nil {

cmd/opampsupervisor/.goreleaser.yaml

@@ -1,4 +1,3 @@
-# yaml-language-server: $schema=https://goreleaser.com/static/schema-pro.json
 version: 2
 project_name: opentelemetry-collector-releases
 env:
@@ -14,13 +13,6 @@ release:
     name: opentelemetry-collector-releases
   make_latest: "false"
   header: '### Release of OpAMP supervisor artifacts'
-msi:
-  - id: opampsupervisor
-    name: opampsupervisor_{{ .Version }}_{{ .Os }}_{{ .MsiArch }}
-    wxs: cmd/opampsupervisor/windows-installer.wxs
-    extra_files:
-      - opentelemetry.ico
-      - config.windows.example.yaml
 builds:
   - id: opampsupervisor-linux
     goos: