From 42cd1674a55659cd9046399ebf8603ad85a85b2f Mon Sep 17 00:00:00 2001 From: PaoloGallina Date: Thu, 14 Mar 2024 15:56:58 +0100 Subject: [PATCH] fix(pipeline): deal with jmx exe (#288) --- .github/workflows/on_prerelease.yaml | 1 + build/windows/download_nrjmx.sh | 2 +- build/windows/download_zip_extract_exe.ps1 | 19 ------------------- 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 build/windows/download_zip_extract_exe.ps1 diff --git a/.github/workflows/on_prerelease.yaml b/.github/workflows/on_prerelease.yaml index 51bf36b9..285f18b2 100644 --- a/.github/workflows/on_prerelease.yaml +++ b/.github/workflows/on_prerelease.yaml @@ -64,6 +64,7 @@ jobs: run_integration_nix: false windows_goarch_matrix: '["amd64"]' # 386 is not supported in jmx integrations windows_download_nrjmx: true + win_package_type: exe secrets: inherit diff --git a/build/windows/download_nrjmx.sh b/build/windows/download_nrjmx.sh index 788c3bbb..a79daaa7 100755 --- a/build/windows/download_nrjmx.sh +++ b/build/windows/download_nrjmx.sh @@ -10,4 +10,4 @@ if [[ -z $NRJMX_URL ]]; then NRJMX_URL=https://github.com/newrelic/nrjmx/releases/download/v$NRJMX_VERSION/nrjmx-amd64.$NRJMX_VERSION.msi fi -curl -Ss --fail "$NRJMX_URL" -o "build/package/windows/bundle/nrjmx-amd64.msi" +curl -LSs --fail "$NRJMX_URL" -o "build/package/windows/bundle/nrjmx-amd64.msi" diff --git a/build/windows/download_zip_extract_exe.ps1 b/build/windows/download_zip_extract_exe.ps1 deleted file mode 100644 index d5db60eb..00000000 --- a/build/windows/download_zip_extract_exe.ps1 +++ /dev/null @@ -1,19 +0,0 @@ -param ( - [string]$INTEGRATION="none", - [string]$ARCH="amd64", - [string]$TAG="v0.0.0", - [string]$REPO_FULL_NAME="none" -) -write-host "===> Creating dist folder" -New-Item -ItemType directory -Path .\dist - -$VERSION=${TAG}.substring(1) -$exe_folder="nri-${INTEGRATION}_windows_${ARCH}" -$zip_name="nri-${INTEGRATION}-${ARCH}.${VERSION}.zip" - -$zip_url="https://github.com/${REPO_FULL_NAME}/releases/download/${TAG}/${zip_name}" -write-host "===> Downloading & extracting .exe from ${zip_url}" -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -Invoke-WebRequest "${zip_url}" -OutFile ".\dist\${zip_name}" -write-host "===> Expanding" -expand-archive -path "dist\${zip_name}" -destinationpath "dist\${exe_folder}\" \ No newline at end of file