fix: add exe metadata

vjripoll · vjripoll · commit 7550045f62fb · 2026-02-19T15:53:01.000+01:00
diff --git a/.github/workflows/component_packages.yml b/.github/workflows/component_packages.yml
@@ -38,11 +38,11 @@ jobs:
     runs-on: ubuntu-latest
     name: Build and upload
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'build/embedded/go.mod'
           check-latest: true
@@ -65,19 +65,75 @@ jobs:
           save-cache: false
 
       - name: Install Zig
-        uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2
+        uses: mlugg/setup-zig@v2
 
-      - uses: taiki-e/install-action@288875dd3d64326724fa6d9593062d9f8ba0b131 # v2.67.30
+      - uses: taiki-e/install-action@v2
         with:
           tool: cargo-zigbuild@0.20.1
 
       - name: Install Windows cross-compilation dependencies
         run: |
-          sudo apt-get install -y llvm
+          sudo apt-get update && sudo apt-get install -y llvm nasm
+          sudo ln -sf /usr/bin/llvm-ar /usr/bin/llvm-lib
 
-      - name: Install cargo-xwin
+      - name: Install and Pre-cache cargo-xwin
         run: |
-          cargo install --locked cargo-xwin --force
+          cargo install --locked cargo-xwin
+          
+          rm -rf /home/runner/.cache/cargo-xwin
+          
+          cd /tmp
+          cargo new pre_cache_dummy
+          cd pre_cache_dummy
+          
+          cargo xwin build --target x86_64-pc-windows-msvc
+          
+          cd $GITHUB_WORKSPACE
+
+      - name: Install go-winres
+        run: go install github.com/tc-hib/go-winres@latest
+
+      - name: Generate Windows Metadata JSONs
+        run: |
+          cat <<EOF > /tmp/winres-agent.json
+          {
+            "RT_VERSION": {
+              "#1": {
+                "0000": {
+                  "info": {
+                    "0409": {
+                      "CompanyName": "New Relic, Inc.",
+                      "FileDescription": "New Relic Agent Control",
+                      "LegalCopyright": "© 2026 New Relic, Inc. All rights reserved.",
+                      "OriginalFilename": "newrelic-agent-control.exe",
+                      "ProductName": "New Relic Agent Control"
+                    }
+                  }
+                }
+              }
+            }
+          }
+          EOF
+          
+          cat <<EOF > /tmp/winres-cli.json
+          {
+            "RT_VERSION": {
+              "#1": {
+                "0000": {
+                  "info": {
+                    "0409": {
+                      "CompanyName": "New Relic, Inc.",
+                      "FileDescription": "New Relic Agent Control CLI",
+                      "LegalCopyright": "© 2026 New Relic, Inc. All rights reserved.",
+                      "OriginalFilename": "newrelic-agent-control-cli.exe",
+                      "ProductName": "New Relic Agent Control CLI"
+                    }
+                  }
+                }
+              }
+            }
+          }
+          EOF
 
       - name: If pre-release, set tag and verify it matches Cargo.toml version
         if: ${{ inputs.pre-release}}
@@ -101,22 +157,22 @@ jobs:
           echo SKIP_WINDOWS_SIGN="true" >> $GITHUB_ENV
 
       - name: Release packages with GoReleaser
-        uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6
+        uses: goreleaser/goreleaser-action@v6
         with:
-          args: release ${{ env.SKIP_UPLOAD_RELEASE }} ${{ env.SKIP_SIGN }} --clean --verbose --timeout 2h
+          args: release ${{ env.SKIP_UPLOAD_RELEASE }} ${{ env.SKIP_SIGN }} --clean --verbose --timeout 2h --parallelism 1
         env:
           GITHUB_TOKEN: ${{ secrets.gh_token }}
-          GPG_PRIVATE_KEY_BASE64: ${{ secrets.gpg_private_key_base64 }} # base64 encoded
+          GPG_PRIVATE_KEY_BASE64: ${{ secrets.gpg_private_key_base64 }}
           GPG_PASSPHRASE: ${{ secrets.gpg_passphrase }}
-          PFX_CERTIFICATE_BASE64: ${{ secrets.pfx_certificate_base64 }} # base64 encoded
+          PFX_CERTIFICATE_BASE64: ${{ secrets.pfx_certificate_base64 }}
           PFX_PASSPHRASE: ${{ secrets.pfx_passphrase }}
           GPG_MAIL: 'infrastructure-eng@newrelic.com'
           NR_RELEASE_TAG: ${{ inputs.tag_name }}
           GORELEASER_CURRENT_TAG: ${{ inputs.tag_name }}
           SKIP_WINDOWS_SIGN: ${{ env.SKIP_WINDOWS_SIGN }}
 
       - name: Upload assets to pipeline
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+        uses: actions/upload-artifact@v4
         with:
           retention-days: 1
           name: built-binaries-${{ inputs.tag_name }}
@@ -130,10 +186,10 @@ jobs:
     needs: build
     if: ${{ ! inputs.skip_sign }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v4
 
       - name: Download built binaries
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
+        uses: actions/download-artifact@v4
         with:
           name: built-binaries-${{ inputs.tag_name }}
           path: ./artifacts
@@ -144,4 +200,4 @@ jobs:
           ./build/scripts/windows-exec-sign/verify-signature.ps1 -Executables @(
             "./artifacts/dist/newrelic-agent-control-windows_x86_64-pc-windows-msvc/newrelic-agent-control.exe",
             "./artifacts/dist/newrelic-agent-control-cli-windows_x86_64-pc-windows-msvc/newrelic-agent-control-cli.exe"
-          )
+          )
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -49,6 +49,7 @@ builds:
       - NR_OTEL_COLLECTOR_VERSION={{ .Env.NR_OTEL_COLLECTOR_VERSION }}
     hooks:
       post:
+        - cmd: /home/runner/go/bin/go-winres patch --in /tmp/winres-agent.json --product-version {{ .Version }} --file-version {{ .Version }} {{ .Path }}
         - cmd: ./build/scripts/windows-exec-sign/sign.sh
           env:
             - SKIP_WINDOWS_SIGN={{ if index .Env "SKIP_WINDOWS_SIGN"}}{{ .Env.SKIP_WINDOWS_SIGN }}{{ else }}{{ end }}
@@ -86,11 +87,12 @@ builds:
     env:
       - AGENT_CONTROL_VERSION={{ .Version }}
     hooks:
-      pre:
-        # Wait for newrelic-agent-control to be ready (parallel executions of cargo-xwin can be problematic)
-        - cmd: sh -c 'while [ ! -f target/x86_64-pc-windows-msvc/release/newrelic-agent-control.exe ]; do echo "Waiting for newrelic-agent-control-windows build to complete..."; sleep 5; done'
-          output: true
+      #      pre:
+      #        # Wait for newrelic-agent-control to be ready (parallel executions of cargo-xwin can be problematic)
+      #        - cmd: sh -c 'while [ ! -f target/x86_64-pc-windows-msvc/release/newrelic-agent-control.exe ]; do echo "Waiting for newrelic-agent-control-windows build to complete..."; sleep 5; done'
+      #          output: true
       post:
+        - cmd: /home/runner/go/bin/go-winres patch --in /tmp/winres-cli.json --product-version {{ .Version }} --file-version {{ .Version }} {{ .Path }}
         # This step cannot be done inside the 'signs' section because that happens after packaging.
         - cmd: ./build/scripts/windows-exec-sign/sign.sh
           env:
diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
@@ -3045,6 +3045,12 @@ Distributed under the following license(s):
 
 * MIT
 
+## winres <https://crates.io/crates/winres>
+
+Distributed under the following license(s):
+
+* MIT
+
 ## wit-bindgen <https://crates.io/crates/wit-bindgen>
 
 Distributed under the following license(s):
diff --git a/agent-control/build.rs b/agent-control/build.rs
@@ -12,10 +12,9 @@ const GENERATED_REGISTRY_FILE: &str = "generated_agent_type_registry.rs";
 
 fn main() {
     generate_agent_type_registry();
-    // setup the env variable for the generated registry path
+
     println!("cargo:rustc-env=GENERATED_REGISTRY_FILE={GENERATED_REGISTRY_FILE}");
-    // re-run only if the registry has changed
-    println!("cargo:rerun-if-changed={REGISTRY_PATH}")
+    println!("cargo:rerun-if-changed={REGISTRY_PATH}");
 }
 
 fn generate_agent_type_registry() {
