Change the location of opentelemetry.ico

open-telemetry · May 30, 2024 · dc7339f · dc7339f
1 parent 68dd254
commit dc7339f
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go
@@ -117,7 +117,7 @@ func WinPackage(dist string) config.MSI {
 		WXS:  "./windows/installer.wxs",
 		Files: []string{
 			"config.yaml",
-			"./windows/opentelemetry.ico",
+			"opentelemetry.ico",
 		},
 	}
 }

diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml
@@ -9,7 +9,7 @@ msi:
     wxs: ./windows/installer.wxs
     extra_files:
       - config.yaml
-      - ./windows/opentelemetry.ico
+      - opentelemetry.ico
 builds:
   - id: otelcol-contrib
     goos:

diff --git a/...otelcol-contrib/windows/opentelemetry.ico → ...butions/otelcol-contrib/opentelemetry.ico b/...otelcol-contrib/windows/opentelemetry.ico → ...butions/otelcol-contrib/opentelemetry.ico
diff --git a/distributions/otelcol-contrib/windows/installer.wxs b/distributions/otelcol-contrib/windows/installer.wxs
@@ -13,7 +13,7 @@
          Comments="Windows Installer Package"
          InstallScope="perMachine"/>
       <Media Id="1" Cabinet="product.cab" EmbedCab="yes"/>
-      <Icon Id="ProductIcon" SourceFile="$(sys.SOURCEFILEDIR)/windows/opentelemetry.ico"/>
+      <Icon Id="ProductIcon" SourceFile="opentelemetry.ico"/>
       <Property Id="ARPPRODUCTICON" Value="ProductIcon"/>
       <Property Id="ARPHELPLINK" Value="https://opentelemetry.io/"/>
       <Property Id="ARPURLINFOABOUT" Value="https://opentelemetry.io/"/>

diff --git a/distributions/otelcol/.goreleaser.yaml b/distributions/otelcol/.goreleaser.yaml
@@ -9,7 +9,7 @@ msi:
     wxs: ./windows/installer.wxs
     extra_files:
       - config.yaml
-      - ./windows/opentelemetry.ico
+      - opentelemetry.ico
 builds:
   - id: otelcol
     goos:

diff --git a/...butions/otelcol/windows/opentelemetry.ico → distributions/otelcol/opentelemetry.ico b/...butions/otelcol/windows/opentelemetry.ico → distributions/otelcol/opentelemetry.ico
diff --git a/distributions/otelcol/windows/installer.wxs b/distributions/otelcol/windows/installer.wxs
@@ -13,7 +13,7 @@
          Comments="Windows Installer Package"
          InstallScope="perMachine"/>
       <Media Id="1" Cabinet="product.cab" EmbedCab="yes"/>
-      <Icon Id="ProductIcon" SourceFile="$(sys.SOURCEFILEDIR)/windows/opentelemetry.ico"/>
+      <Icon Id="ProductIcon" SourceFile="opentelemetry.ico"/>
       <Property Id="ARPPRODUCTICON" Value="ProductIcon"/>
       <Property Id="ARPHELPLINK" Value="https://opentelemetry.io/"/>
       <Property Id="ARPURLINFOABOUT" Value="https://opentelemetry.io/"/>