fix(CI): build arm64 artifacts (#26807)

bnpfeife · web-flow · commit 3d4f3a2444a5 · 2025-09-16T15:32:08.000-04:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -57,42 +57,62 @@ jobs:
       - run:
           name: Build binaries
           command: |
-            export CC="$(xcc linux x86_64)"
-            export CGO_ENABLED=1
+            mkdir -p ./bins/linux-amd64 \
+                     ./bins/linux-arm64 \
+                     ./artifacts
+
+            build() {
+              for binary in \
+                influx \
+                influx_inspect \
+                influxd
+              do
+                go build \
+                  -tags "netgo,osusergo,static_build" \
+                  -buildmode=pie \
+                  -ldflags="-s
+                    -X \"main.version=${VERSION}\"
+                    -X \"main.branch=${CIRCLE_BRANCH}\"
+                    -X \"main.commit=${CIRCLE_SHA1}\"
+                    -linkmode=external
+                    -extld=${CC}
+                    -extldflags \"-fno-PIC -static-pie -Wl,-z,stack-size=8388608\"" \
+                  -o "bins/${GOOS}-${GOARCH}/${binary}" \
+                  "github.com/influxdata/influxdb/cmd/${binary}"
+              done
+            }
+
+            archive() {
+              target="artifacts/influxdb_bin_${GOOS}_${GOARCH}-${CIRCLE_SHA1}.tar.gz"
+              tar -czf "${target}" -C "bins/${GOOS}-${GOARCH}" \
+                influx \
+                influx_inspect \
+                influxd
+              md5sum    "${target}" > "${target}.md5"
+              sha256sum "${target}" > "${target}.sha256"
+            }
 
             # linux amd64 (static build)
-            export GOOS=linux
+            export CC="$(xcc linux x86_64)"
+            export CGO_ENABLED=1
             export GOARCH=amd64
-            for cmd in github.com/influxdata/influxdb/cmd/{influxd,influx,influx_inspect}
-            do
-              go build \
-                -tags "netgo,osusergo,static_build" \
-                -buildmode=pie \
-                -ldflags="-s
-                  -X \"main.version=${VERSION}\"
-                  -X \"main.branch=${CIRCLE_BRANCH}\"
-                  -X \"main.commit=${CIRCLE_SHA1}\"
-                  -linkmode=external
-                  -extld=${CC}
-                  -extldflags \"-fno-PIC -static-pie -Wl,-z,stack-size=8388608\"" \
-                ${cmd}
-            done
-
-            mkdir -p ./bins
+            export GOOS=linux
+            build
+            archive
 
-            target="bins/influxdb_bin_${GOOS}_${GOARCH}-${CIRCLE_SHA1}.tar.gz"
-            tar -czf "${target}" \
-              influx             \
-              influx_inspect     \
-              influxd
-            md5sum    "${target}" > "${target}.md5"
-            sha256sum "${target}" > "${target}.sha256"
+            # linux arm64 (static build)
+            export CC="$(xcc linux aarch64)"
+            export CGO_ENABLED=1
+            export GOARCH=arm64
+            export GOOS=linux
+            build
+            archive
       - store_artifacts:
-          path: bins/
+          path: artifacts/
       - persist_to_workspace:
           root: .
           paths:
-              - bins
+              - artifacts
       - save_cache:
           key: influxdb-cache-v1-{{ checksum "go.mod" }}
           paths:
diff --git a/.circleci/packages/config.yaml b/.circleci/packages/config.yaml
@@ -7,11 +7,16 @@ version:
     value: '1.x-{{env.CIRCLE_SHA1[:8]}}'
 
 sources:
-  - binary: /tmp/workspace/bins/influxdb_bin_linux_amd64-*.tar.gz
+  - binary: /tmp/workspace/artifacts/influxdb_bin_linux_amd64-*.tar.gz
     target: packages/
     arch:   amd64
     plat:   linux
 
+  - binary: /tmp/workspace/artifacts/influxdb_bin_linux_arm64-*.tar.gz
+    target: packages/
+    arch:   arm64
+    plat:   linux
+
 packages:
   - name:        influxdb
     description: Distributed time-series database.
