Remove i386 builds
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
This commit is contained in:
parent
52b66bfb84
commit
fd20f6f16a
|
@ -62,7 +62,7 @@ jobs:
|
||||||
(Get-Content -Path VERSION) -replace '\+', '_' | Set-Content -Path VERSION
|
(Get-Content -Path VERSION) -replace '\+', '_' | Set-Content -Path VERSION
|
||||||
make build-all
|
make build-all
|
||||||
# GH requires all files to have different names, so add version/arch to differentiate
|
# GH requires all files to have different names, so add version/arch to differentiate
|
||||||
foreach($Arch in "amd64", "arm64","386") {
|
foreach($Arch in "amd64", "arm64") {
|
||||||
Move-Item output\$Arch\windows_exporter.exe output\windows_exporter-$Version-$Arch.exe
|
Move-Item output\$Arch\windows_exporter.exe output\windows_exporter-$Version-$Arch.exe
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,7 +80,7 @@ jobs:
|
||||||
$TagName = $env:GITHUB_REF -replace 'refs/tags/', ''
|
$TagName = $env:GITHUB_REF -replace 'refs/tags/', ''
|
||||||
# The MSI version is not semver compliant, so just take the numerical parts
|
# The MSI version is not semver compliant, so just take the numerical parts
|
||||||
$MSIVersion = $TagName -replace '^v?([0-9\.]+).*$','$1'
|
$MSIVersion = $TagName -replace '^v?([0-9\.]+).*$','$1'
|
||||||
foreach($Arch in "amd64", "arm64", "386") {
|
foreach($Arch in "amd64", "arm64") {
|
||||||
Write-Verbose "Building windows_exporter $MSIVersion msi for $Arch"
|
Write-Verbose "Building windows_exporter $MSIVersion msi for $Arch"
|
||||||
.\installer\build.ps1 -PathToExecutable .\output\windows_exporter-$BuildVersion-$Arch.exe -Version $MSIVersion -Arch "$Arch"
|
.\installer\build.ps1 -PathToExecutable .\output\windows_exporter-$BuildVersion-$Arch.exe -Version $MSIVersion -Arch "$Arch"
|
||||||
Move-Item installer\windows_exporter-$MSIVersion-$Arch.msi output\
|
Move-Item installer\windows_exporter-$MSIVersion-$Arch.msi output\
|
||||||
|
|
1
Makefile
1
Makefile
|
@ -41,7 +41,6 @@ crossbuild:
|
||||||
# on Windows, so for now, we'll just build twice
|
# on Windows, so for now, we'll just build twice
|
||||||
GOARCH=amd64 promu build --prefix=output/amd64
|
GOARCH=amd64 promu build --prefix=output/amd64
|
||||||
GOARCH=arm64 promu build --prefix=output/arm64
|
GOARCH=arm64 promu build --prefix=output/arm64
|
||||||
GOARCH=386 promu build --prefix=output/386
|
|
||||||
|
|
||||||
build-image: crossbuild
|
build-image: crossbuild
|
||||||
$(DOCKER) build --build-arg=BASE=$(BASE_IMAGE):$(OS) -f Dockerfile -t $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)-$(OS) .
|
$(DOCKER) build --build-arg=BASE=$(BASE_IMAGE):$(OS) -f Dockerfile -t $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)-$(OS) .
|
||||||
|
|
|
@ -5,7 +5,7 @@ Param (
|
||||||
[Parameter(Mandatory = $true)]
|
[Parameter(Mandatory = $true)]
|
||||||
[String] $Version,
|
[String] $Version,
|
||||||
[Parameter(Mandatory = $false)]
|
[Parameter(Mandatory = $false)]
|
||||||
[ValidateSet("amd64", "arm64", "386")]
|
[ValidateSet("amd64", "arm64")]
|
||||||
[String] $Arch = "amd64"
|
[String] $Arch = "amd64"
|
||||||
)
|
)
|
||||||
$ErrorActionPreference = "Stop"
|
$ErrorActionPreference = "Stop"
|
||||||
|
@ -23,7 +23,7 @@ mkdir -Force Work | Out-Null
|
||||||
Copy-Item -Force $PathToExecutable Work/windows_exporter.exe
|
Copy-Item -Force $PathToExecutable Work/windows_exporter.exe
|
||||||
|
|
||||||
Write-Verbose "Creating windows_exporter-${Version}-${Arch}.msi"
|
Write-Verbose "Creating windows_exporter-${Version}-${Arch}.msi"
|
||||||
$wixArch = @{"amd64" = "x64"; "arm64" = "arm64"; "386" = "x86"}[$Arch]
|
$wixArch = @{"amd64" = "x64"; "arm64" = "arm64"}[$Arch]
|
||||||
$wixOpts = "-ext WixFirewallExtension -ext WixUtilExtension"
|
$wixOpts = "-ext WixFirewallExtension -ext WixUtilExtension"
|
||||||
Invoke-Expression "wix build -arch $wixArch -o .\windows_exporter-$($Version)-$($Arch).msi .\windows_exporter.wxs -d Version=$($Version) -ext WixToolset.Firewall.wixext -ext WixToolset.Util.wixext"
|
Invoke-Expression "wix build -arch $wixArch -o .\windows_exporter-$($Version)-$($Arch).msi .\windows_exporter.wxs -d Version=$($Version) -ext WixToolset.Firewall.wixext -ext WixToolset.Util.wixext"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue