use less confusing build artifact names

ConSol-Monitoring · Mar 19, 2024 · 6477498 · 6477498
1 parent 7f2425c
commit 6477498
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 24 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -83,7 +83,7 @@ jobs:
       fail-fast: false
       matrix:
         go-os: [linux, freebsd]
-        go-arch: [386, amd64, arm64]
+        go-arch: [i386, x86_64, aarch64]
     needs: [get-version]
     runs-on: ubuntu-latest
     env:
@@ -97,7 +97,7 @@ jobs:
           go-version: ${{ env.GOVERSION }}
       - run: |
           echo "Building ${{ env.BIN }}"
-          make GOOS=${{ matrix.go-os }} GOARCH=${{ matrix.go-arch }} build
+          GOOS=${{ matrix.go-os }} GOARCH=${{ matrix.go-arch }} make build
       - uses: actions/upload-artifact@v4.3.1
         with:
           name: "${{ env.BIN }}"
@@ -110,7 +110,7 @@ jobs:
       fail-fast: false
       matrix:
         go-os: [darwin]
-        go-arch: [amd64, arm64]
+        go-arch: [x86_64, aarch64]
     needs: [get-version]
     runs-on: macos-latest
     env:
@@ -124,7 +124,7 @@ jobs:
           go-version: ${{ env.GOVERSION }}
       - run: |
           echo "Building ${{ env.BIN }}"
-          make GOOS=${{ matrix.go-os }} GOARCH=${{ matrix.go-arch }} build
+          GOOS=${{ matrix.go-os }} GOARCH=${{ matrix.go-arch }} make build
       - uses: actions/upload-artifact@v4.3.1
         with:
           name: "${{ env.BIN }}"
@@ -137,7 +137,7 @@ jobs:
       fail-fast: false
       matrix:
         go-os: [windows]
-        go-arch: [386, amd64]
+        go-arch: [i386, x86_64]
     needs: [get-version]
     runs-on: ubuntu-latest
     env:
@@ -156,7 +156,7 @@ jobs:
           cp -rp packaging/windows/winres .
           ./tools/go-winres make  --arch 386,amd64,arm64
           cp rsrc_windows*.syso cmd/snclient/
-          make GOOS=${{ matrix.go-os }} GOARCH=${{ matrix.go-arch }} build
+          GOOS=${{ matrix.go-os }} GOARCH=${{ matrix.go-arch }} make build
           mv snclient snclient.exe
       - uses: actions/upload-artifact@v4.3.1
         with:
@@ -170,7 +170,7 @@ jobs:
       fail-fast: false
       matrix:
         go-os: [windows]
-        go-arch: [386, amd64]
+        go-arch: [i386, x86_64]
     needs: [get-version, build-win]
     runs-on: windows-latest
     env:
@@ -232,7 +232,7 @@ jobs:
     strategy:
       matrix:
         go-os: [windows]
-        go-arch: [386, amd64]
+        go-arch: [i386, x86_64]
     needs: [get-version, build-win, dist-win, sign-win]
     runs-on: windows-latest
     env:
@@ -289,7 +289,7 @@ jobs:
     strategy:
       matrix:
         go-os: [linux]
-        go-arch: [386, amd64, arm64]
+        go-arch: [i386, x86_64, aarch64]
     runs-on: ubuntu-latest
     needs: [get-version, build]
     env:
@@ -305,7 +305,7 @@ jobs:
           echo "Building ${{ env.BIN }}.deb"
           export DEBEMAIL="Sven Nierlein <sven.nierlein@consol.de>"
           export DEBFULLNAME="Sven Nierlein"
-          make VERSION=${{needs.get-version.outputs.version}} ARCH=${{ matrix.go-arch }} DEBFILE=${{ env.BIN }}.deb deb
+          ARCH=${{ matrix.go-arch }} make VERSION=${{needs.get-version.outputs.version}} DEBFILE=${{ env.BIN }}.deb deb
       - uses: actions/upload-artifact@v4.3.1
         with:
           name: "${{ env.BIN }}.deb"
@@ -317,7 +317,7 @@ jobs:
     strategy:
       matrix:
         go-os: [darwin]
-        go-arch: [amd64, arm64]
+        go-arch: [x86_64, aarch64]
     runs-on: macos-latest
     needs: [get-version, build-osx]
     env:
@@ -350,7 +350,7 @@ jobs:
     strategy:
       matrix:
         go-os: [linux]
-        go-arch: [386, amd64, arm64]
+        go-arch: [i386, x86_64, aarch64]
     runs-on: ubuntu-latest
     needs: [get-version, build]
     env:
@@ -366,7 +366,7 @@ jobs:
       - run: sudo apt-get install help2man
       - run: |
           echo "Building ${{ env.BIN }}.rpm"
-          make rpm
+          ARCH=${{ matrix.go-arch }} make rpm
           mv snclient*.rpm ${{ env.BIN }}.rpm
       - uses: actions/upload-artifact@v4.3.1
         with:
@@ -380,7 +380,7 @@ jobs:
     strategy:
       matrix:
         go-os: [linux]
-        go-arch: [386, amd64, arm64]
+        go-arch: [i386, x86_64, aarch64]
     runs-on: ubuntu-latest
     needs: [get-version,pkg-rpm,pkg-deb]
     env:
@@ -423,7 +423,7 @@ jobs:
     strategy:
       matrix:
         go-os: [windows]
-        go-arch: [amd64]
+        go-arch: [x86_64]
     runs-on: windows-latest
     needs: [get-version,pkg-msi]
     env:
@@ -447,7 +447,7 @@ jobs:
       - name: "Windows Integration Tests"
         run: |
           Move-Item -Path ${{ env.BIN }}.msi -Destination .\t\snclient.msi
-          Copy-Item .\windist\windows_exporter-${{ matrix.go-arch }}.exe .\windist\windows_exporter.exe
+          Copy-Item .\windist\windows_exporter-amd64.exe .\windist\windows_exporter.exe
           cd t
           go test -v ; if ($LASTEXITCODE -ne 0) { exit 1 }
         shell: powershell
@@ -466,7 +466,7 @@ jobs:
     strategy:
       matrix:
         go-os: [windows]
-        go-arch: [386, amd64]
+        go-arch: [i386, x86_64]
     needs: [get-version, integration-test-windows]
     runs-on: windows-latest
     env:
@@ -499,7 +499,7 @@ jobs:
     strategy:
       matrix:
         go-os: [windows]
-        go-arch: [386, amd64]
+        go-arch: [i386, x86_64]
     runs-on: ubuntu-latest
     needs: [get-version,make-release]
     env:
@@ -518,7 +518,7 @@ jobs:
     strategy:
       matrix:
         go-os: [linux]
-        go-arch: [386, amd64, arm64]
+        go-arch: [i386, x86_64, aarch64]
     runs-on: ubuntu-latest
     needs: [get-version,make-release]
     env:
@@ -537,7 +537,7 @@ jobs:
     strategy:
       matrix:
         go-os: [linux]
-        go-arch: [386, amd64, arm64]
+        go-arch: [i386, x86_64, aarch64]
     runs-on: ubuntu-latest
     needs: [get-version,make-release]
     env:
@@ -556,7 +556,7 @@ jobs:
     strategy:
       matrix:
         go-os: [darwin]
-        go-arch: [amd64, arm64]
+        go-arch: [x86_64, aarch64]
     runs-on: ubuntu-latest
     needs: [get-version,make-release]
     env:
@@ -575,7 +575,7 @@ jobs:
     strategy:
       matrix:
         go-os: [freebsd]
-        go-arch: [386, amd64, arm64]
+        go-arch: [i386, x86_64, aarch64]
     runs-on: ubuntu-latest
     needs: [get-version,make-release]
     env:

diff --git a/Makefile b/Makefile
@@ -38,6 +38,16 @@ ifeq ($(RPM_ARCH),arm64)
 	RPM_ARCH=aarch64
 endif
 
+ifeq ($(GOARCH),i386)
+	export GOARCH := 386
+endif
+ifeq ($(GOARCH),x86_64)
+	export GOARCH := amd64
+endif
+ifeq ($(GOARCH),aarch64)
+	export GOARCH := arm64
+endif
+
 BUILD_FLAGS=-ldflags "-s -w -X pkg/snclient.Build=$(BUILD) -X pkg/snclient.Revision=$(REVISION)"
 TEST_FLAGS=-timeout=5m $(BUILD_FLAGS)
 

diff --git a/packaging/windows/build_msi.ps1 b/packaging/windows/build_msi.ps1
@@ -20,8 +20,10 @@ If (-Not (Test-Path -Path "C:\Program Files (x86)\WiX Toolset v3.14\bin\candle.e
 }
 
 $win_arch = "$arch"
-if ("$arch" -eq "386")   { $win_arch = "x86" }
-if ("$arch" -eq "amd64") { $win_arch = "x64" }
+if ("$arch" -eq "386")    { $win_arch = "x86" }
+if ("$arch" -eq "i386")   { $win_arch = "x86" }
+if ("$arch" -eq "amd64")  { $win_arch = "x64" }
+if ("$arch" -eq "x86_64") { $win_arch = "x64" }
 
 & 'C:\Program Files (x86)\WiX Toolset v3.14\bin\candle.exe' .\packaging\windows\snclient.wxs `
   -arch $win_arch `