From 0c85d51a3a73fa4b875da4b0b03133e6ca8742e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Sun, 12 May 2024 02:18:40 +0200 Subject: [PATCH 1/3] fix: release build again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- .github/workflows/release.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4126b538a..6336de281 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -75,18 +75,13 @@ jobs: path: output\windows_exporter-*.exe - name: Build Release Artifacts - if: ${{ github.event_name != 'pull_request' }} run: | $ErrorActionPreference = "Stop" $BuildVersion = Get-Content VERSION - $TagName = $env:GITHUB_REF -replace 'refs/tags/', '' - - # The MSI version is not semver compliant, so just take the numerical parts - $MSIVersion = $TagName -replace '^v?([0-9\.]+).*$','$1' foreach($Arch in "amd64", "arm64") { - Write-Verbose "Building windows_exporter $MSIVersion msi for $Arch" - .\installer\build.ps1 -PathToExecutable .\output\windows_exporter-$BuildVersion-$Arch.exe -Version $MSIVersion -Arch "$Arch" + Write-Host "Building windows_exporter $MSIVersion msi for $Arch" + .\installer\build.ps1 -PathToExecutable .\output\windows_exporter-$BuildVersion-$Arch.exe -Version $BuildVersion -Arch "$Arch" Move-Item installer\windows_exporter-$MSIVersion-$Arch.msi output\ } From edbfec06784b926f7aef26e5de7c859d2ff2d272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Sun, 12 May 2024 02:29:13 +0200 Subject: [PATCH 2/3] fix: release build again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6336de281..45a37976b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,9 +80,9 @@ jobs: $BuildVersion = Get-Content VERSION foreach($Arch in "amd64", "arm64") { - Write-Host "Building windows_exporter $MSIVersion msi for $Arch" + Write-Host "Building windows_exporter $BuildVersion msi for $Arch" .\installer\build.ps1 -PathToExecutable .\output\windows_exporter-$BuildVersion-$Arch.exe -Version $BuildVersion -Arch "$Arch" - Move-Item installer\windows_exporter-$MSIVersion-$Arch.msi output\ + Move-Item installer\windows_exporter-$BuildVersion-$Arch.msi output\ } promu checksum output\ From 05ea15c1c1067a8282199a2ba15041d046f5f468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Sun, 12 May 2024 08:41:51 +0200 Subject: [PATCH 3/3] fix: release build again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- .github/workflows/release.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 45a37976b..3b289df71 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,6 +67,8 @@ jobs: foreach($Arch in "amd64", "arm64") { Move-Item output\$Arch\windows_exporter.exe output\windows_exporter-$Version-$Arch.exe } + + Get-ChildItem -Path output - name: Upload Artifacts uses: actions/upload-artifact@v4 @@ -82,8 +84,10 @@ jobs: foreach($Arch in "amd64", "arm64") { Write-Host "Building windows_exporter $BuildVersion msi for $Arch" .\installer\build.ps1 -PathToExecutable .\output\windows_exporter-$BuildVersion-$Arch.exe -Version $BuildVersion -Arch "$Arch" - Move-Item installer\windows_exporter-$BuildVersion-$Arch.msi output\ } + + Move-Item installer\*.msi output\ + Get-ChildItem -Path output\ promu checksum output\