Pass correct GOOS and GOARCH on to package builders in CI. (#18717)
* Pass correct GOOS and GOARCH on to package builders in CI. This ensures that they don’t pick up the host CPU and build for that instead, because apparently Go looks at the host CPU instead of itself to decide what the default build target is, so if you’re running a 32-bit build of Go on a 64-bit kernel, you get 64-bit binaries by default... * Fix typo in platform name.
Austin S. Hemmelgarn committed
Oct 8, 2024 at 14:43 UTC
44b659f60aa327bc319ffbd32e47eb76234fb2c0
2 files changed
+5
-4
.github/data/distros.yml
+1
-1
@@ -6,7 +6,7 @@ platform_map: # map packaging architectures to docker platforms
6
arm64: linux/arm64/v8
7
armhf: linux/arm/v7
8
armhfp: linux/arm/v7
9
- i386: linux/i386
9
+ i386: linux/386
10
x86_64: linux/amd64
11
arch_order: # sort order for per-architecture jobs in CI
12
- amd64
.github/workflows/packaging.yml
+4
-3
@@ -256,9 +256,10 @@ jobs:
256
shell: bash
257
run: |
258
docker run --security-opt seccomp=unconfined -e DISABLE_TELEMETRY=1 -e VERSION=${{ needs.version-check.outputs.version }} \
259
- -e ENABLE_SENTRY=${{ matrix.bundle_sentry }} -e RELEASE_PIPELINE=${{ env.RELEASE_PIPELINE }} \
260
- -e BUILD_DESTINATION=${{ matrix.distro }}${{ matrix.version }}_${{ matrix.arch }} -e UPLOAD_SENTRY=${{ env.UPLOAD_SENTRY }} \
261
- -e SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_CLI_TOKEN }} -e NETDATA_SENTRY_DSN=${{ secrets.SENTRY_DSN }} \
259
+ -e ENABLE_SENTRY=${{ matrix.bundle_sentry }} -e RELEASE_PIPELINE=${{ env.RELEASE_PIPELINE }} \
260
+ -e BUILD_DESTINATION=${{ matrix.distro }}${{ matrix.version }}_${{ matrix.arch }} -e UPLOAD_SENTRY=${{ env.UPLOAD_SENTRY }} \
261
+ -e SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_CLI_TOKEN }} -e NETDATA_SENTRY_DSN=${{ secrets.SENTRY_DSN }} \
262
+ -e GOOS=$(echo ${{ matrix.platform }} | cut -f 1 -d '/') -e GOARCH=$(echo ${{ matrix.platform }} | cut -f 2 -d '/') \
263
--platform=${{ matrix.platform }} -v "$PWD":/netdata netdata/package-builders:${{ matrix.distro }}${{ matrix.version }}-${{ matrix.builder_rev }}
264
- name: Save Packages
265
id: artifacts