Remove the armhf binary from the release

.github/workflows/build.yaml

@@ -55,7 +55,22 @@ jobs:
             GIT_COMMIT=${{ github.sha }}
             REPO_URL=https://github.com/openfaas/faas-cli
           tags: openfaas/faas-cli:${{ github.sha }}
-      - 
+      -
+        name: Test the redistributable binaries cross-compile
+        uses: docker/build-push-action@v7
+        with:
+          context: .
+          file: ./Dockerfile.redist
+          push: false
+          load: false
+          platforms: linux/amd64
+          target: release
+          build-args: |
+            VERSION=latest-dev
+            GIT_COMMIT=${{ github.sha }}
+            REPO_URL=https://github.com/openfaas/faas-cli
+          tags: openfaas/faas-cli-redist:${{ github.sha }}
+      -
         name: Copy binary to host
         run: |
           docker create --name faas-cli openfaas/faas-cli:${{ github.sha }} && \

.gitignore

@@ -4,7 +4,6 @@ build
 faas-cli
 faas-cli-darwin
 faas-cli-darwin-arm64
-faas-cli-armhf
 faas-cli.exe
 faas-cli-arm64
 

CONTRIBUTING.md

@@ -56,7 +56,7 @@ To build the release binaries type in:
 ./extract_binaries.sh
 ```
 
-This creates the faas-cli for Mac, Windows, Linux x64, Linux ARMHF and Linux ARM64.
+This creates the faas-cli for Mac, Windows, Linux x64 and Linux ARM64.
 
 * The project manages dependencies using Go modules and the `vendor/` folder. When updating a dependency you must run
 

Dockerfile.redist

@@ -1,4 +1,4 @@
 FROM ghcr.io/openfaas/license-check:0.4.2 as license-check
 
 # Build stage
 FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.25 as builder
@@ -26,14 +26,14 @@
 RUN /usr/bin/license-check -path ./ --verbose=false "Alex Ellis" "OpenFaaS Author(s)" "OpenFaaS Ltd" \
        && go test $(go list ./... | grep -v /vendor/ | grep -v /template/|grep -v /build/) -cover
 
 FROM builder as linux
 RUN CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w \
        -X github.com/openfaas/faas-cli/version.GitCommit=${GIT_COMMIT} \
        -X github.com/openfaas/faas-cli/version.Version=${VERSION} \
        -X github.com/openfaas/faas-cli/commands.Platform=x86_64" \
        -o faas-cli
 
 FROM builder as darwin
 RUN CGO_ENABLED=0 GOOS=darwin go build --ldflags "-s -w \
        -X github.com/openfaas/faas-cli/version.GitCommit=${GIT_COMMIT} \
        -X github.com/openfaas/faas-cli/version.Version=${VERSION} \
@@ -41,28 +41,21 @@
        -o faas-cli-darwin
 
 
 FROM builder as darwin-arm64
 RUN CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build --ldflags "-s -w \
        -X github.com/openfaas/faas-cli/version.GitCommit=${GIT_COMMIT} \
        -X github.com/openfaas/faas-cli/version.Version=${VERSION} \
        -X github.com/openfaas/faas-cli/commands.Platform=arm64" \
        -o faas-cli-darwin-arm64
 
 FROM builder as windows
 RUN CGO_ENABLED=0 GOOS=windows go build --ldflags "-s -w \
        -X github.com/openfaas/faas-cli/version.GitCommit=${GIT_COMMIT} \
        -X github.com/openfaas/faas-cli/version.Version=${VERSION} \
        -X github.com/openfaas/faas-cli/commands.Platform=x86_64" \
        -o faas-cli.exe
 
-FROM builder as arm
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build --ldflags "-s -w \
-       -X github.com/openfaas/faas-cli/version.GitCommit=${GIT_COMMIT} \
-       -X github.com/openfaas/faas-cli/version.Version=${VERSION} \
-       -X github.com/openfaas/faas-cli/commands.Platform=armhf" \
-       -o faas-cli-armhf
-
 FROM builder as arm64
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build --ldflags "-s -w \
        -X github.com/openfaas/faas-cli/version.GitCommit=${GIT_COMMIT} \
        -X github.com/openfaas/faas-cli/version.Version=${VERSION} \
@@ -70,7 +63,7 @@
        -o faas-cli-arm64
 
 # Release stage
 FROM alpine:3.21.0 as release
 
 RUN apk --no-cache add ca-certificates git
 
@@ -83,7 +76,6 @@
 COPY --from=linux          /go/src/github.com/openfaas/faas-cli/faas-cli                .
 COPY --from=darwin         /go/src/github.com/openfaas/faas-cli/faas-cli-darwin         .
 COPY --from=darwin-arm64   /go/src/github.com/openfaas/faas-cli/faas-cli-darwin-arm64   .
-COPY --from=arm            /go/src/github.com/openfaas/faas-cli/faas-cli-armhf          .
 COPY --from=windows        /go/src/github.com/openfaas/faas-cli/faas-cli.exe            .
 COPY --from=arm64          /go/src/github.com/openfaas/faas-cli/faas-cli-arm64          .
 

Makefile

@@ -65,14 +65,6 @@ dist:
 test-unit:
 	go test $(shell go list ./... | grep -v /vendor/ | grep -v /template/ | grep -v build) -cover
 
-.PHONY: ci-armhf-push
-ci-armhf-push:
-	(docker push openfaas/faas-cli:$(TAG)-armhf && docker push openfaas/faas-cli:$(TAG)-root-armhf)
-
-.PHONY: ci-armhf-build
-ci-armhf-build:
-	(./build.sh $(TAG)-armhf)
-
 .PHONY: ci-arm64-push
 ci-arm64-push:
 	(docker push openfaas/faas-cli:$(TAG)-arm64 && docker push openfaas/faas-cli:$(TAG)-root-arm64)

build_integration_test.sh

@@ -23,13 +23,6 @@ get_package() {
         ;;
         esac
     ;;
-    "Linux")
-        case $arch in
-        "armv6l" | "armv7l")
-        cli="./faas-cli-armhf"
-        ;;
-        esac
-    ;;
     esac
 
     echo "Using package $cli"

commands/local_run_resources.go

@@ -136,7 +136,7 @@ func negativeMemoryError(value string) error {
 
 func oversizedMemoryError(value string) error {
 	// Typed as int64 so the constant does not take its default type of int,
-	// which overflows when cross-compiling for a 32-bit target such as armhf.
+	// which would overflow when building for a 32-bit target.
 	return fmt.Errorf("invalid memory value %q: must be under %d bytes", value, int64(math.MaxInt64))
 }
 

extract_binaries.sh

@@ -15,7 +15,6 @@ docker create --name faas-cli openfaas/faas-cli:${eTAG} && \
   docker cp faas-cli:/home/app/faas-cli ./bin && \
   docker cp faas-cli:/home/app/faas-cli-darwin ./bin && \
   docker cp faas-cli:/home/app/faas-cli-darwin-arm64 ./bin && \
-  docker cp faas-cli:/home/app/faas-cli-armhf ./bin && \
   docker cp faas-cli:/home/app/faas-cli-arm64 ./bin && \
   docker cp faas-cli:/home/app/faas-cli.exe ./bin && \
   docker rm -f faas-cli

npm/lib.js

@@ -18,10 +18,6 @@ module.exports = {
             if (arch === 'aarch64') {
                 return '-arm64';
             }
-
-            if (arch === 'armv61' || arch === 'armv71') {
-                return '-armhf'
-            }
         }
 
         if (type === 'Darwin') {

npm/test.js

@@ -14,13 +14,9 @@ describe('Platform Suffix', function () {
         let result = lib.getSuffix('Linux', 'aarch64');
         assert.equal(result, '-arm64', `Expected '-arm64', but got: ${result}`);
     });
-    it('should return -armhf for Linux armv61', function () {
-        let result = lib.getSuffix('Linux', 'armv61');
-        assert.equal(result, '-armhf', `Expected '-armhf', but got: ${result}`);
-    });
-    it('should return -armhf for Linux armv71', function () {
-        let result = lib.getSuffix('Linux', 'armv71');
-        assert.equal(result, '-armhf', `Expected '-armhf', but got: ${result}`);
+    it('should throw for 32-bit Arm, which is no longer published', function () {
+        assert.throws(() => {lib.getSuffix('Linux', 'armv61')});
+        assert.throws(() => {lib.getSuffix('Linux', 'armv71')});
     });
     it('should return -darwin for MacOS', function () {
         let result = lib.getSuffix('Darwin', '');