From 836a1c6491def13ce0b66447f5cfa7c49aebd012 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 14:17:37 +0000 Subject: [PATCH 1/2] chore(deps): update dependency windows to v2022 --- .github/workflows/prerelease.yml | 4 ++-- .github/workflows/push_pr.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 8721055..7a832a8 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -30,7 +30,7 @@ jobs: test-windows: name: Run unit tests on Windows - runs-on: windows-2019 + runs-on: windows-2022 env: GOPATH: ${{ github.workspace }} defaults: @@ -96,7 +96,7 @@ jobs: package-win: name: Create MSI & Upload into GH Release assets - runs-on: windows-2019 + runs-on: windows-2022 needs: [prerelease] env: GOPATH: ${{ github.workspace }} diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml index b0bfaa4..ec0cf5e 100644 --- a/.github/workflows/push_pr.yml +++ b/.github/workflows/push_pr.yml @@ -49,7 +49,7 @@ jobs: test-windows: name: Run unit tests on Windows - runs-on: windows-2019 + runs-on: windows-2022 env: GOPATH: ${{ github.workspace }} defaults: From 7a815a368e239f3e7f503fce239da267f948a972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Felipe=20=C3=81lvarez?= Date: Tue, 24 Oct 2023 17:26:43 +0200 Subject: [PATCH 2/2] fix: signing tool path --- build/package/windows/nri-386-installer/nri-installer.wixproj | 4 ++-- .../package/windows/nri-amd64-installer/nri-installer.wixproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/package/windows/nri-386-installer/nri-installer.wixproj b/build/package/windows/nri-386-installer/nri-installer.wixproj index 508f15f..c6fbac5 100644 --- a/build/package/windows/nri-386-installer/nri-installer.wixproj +++ b/build/package/windows/nri-386-installer/nri-installer.wixproj @@ -8,7 +8,7 @@ 2.0 nri-$(IntegrationName)-386 Package - C:\Program Files (x86)\Windows Kits\10\bin\x64\ + C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\ $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets newrelic-nri-$(IntegrationName)-installer @@ -49,4 +49,4 @@ - \ No newline at end of file + diff --git a/build/package/windows/nri-amd64-installer/nri-installer.wixproj b/build/package/windows/nri-amd64-installer/nri-installer.wixproj index 852d3ed..5fb118d 100644 --- a/build/package/windows/nri-amd64-installer/nri-installer.wixproj +++ b/build/package/windows/nri-amd64-installer/nri-installer.wixproj @@ -8,7 +8,7 @@ 2.0 nri-$(IntegrationName)-amd64 Package - C:\Program Files (x86)\Windows Kits\10\bin\x64\ + C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\ $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets newrelic-nri-$(IntegrationName)-installer @@ -49,4 +49,4 @@ - \ No newline at end of file +