Skip to content

adding arm 32bit support #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssmirr merged 1 commit into from
Jan 31, 2026
Merged

adding arm 32bit support #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/release-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ jobs:
path: |
cli/dist/conduit-linux-amd64
cli/dist/conduit-linux-arm64
cli/dist/conduit-linux-arm
cli/dist/conduit-darwin-amd64
cli/dist/conduit-darwin-arm64
cli/dist/conduit-windows-amd64.exe
Expand All @@ -177,6 +178,7 @@ jobs:
files: |
cli/dist/conduit-linux-amd64
cli/dist/conduit-linux-arm64
cli/dist/conduit-linux-arm
cli/dist/conduit-darwin-amd64
cli/dist/conduit-darwin-arm64
cli/dist/conduit-windows-amd64.exe
Expand All @@ -193,6 +195,7 @@ jobs:
|----------|--------------|----------|
| Linux | x86_64 (amd64) | [conduit-linux-amd64](https://github.com/${{ github.repository }}/releases/download/${{ steps.version.outputs.TAG_NAME }}/conduit-linux-amd64) |
| Linux | ARM64 | [conduit-linux-arm64](https://github.com/${{ github.repository }}/releases/download/${{ steps.version.outputs.TAG_NAME }}/conduit-linux-arm64) |
| Linux | ARMv7 (32-bit) | [conduit-linux-arm](https://github.com/${{ github.repository }}/releases/download/${{ steps.version.outputs.TAG_NAME }}/conduit-linux-arm) |
| macOS | Intel (amd64) | [conduit-darwin-amd64](https://github.com/${{ github.repository }}/releases/download/${{ steps.version.outputs.TAG_NAME }}/conduit-darwin-amd64) |
| macOS | Apple Silicon (arm64) | [conduit-darwin-arm64](https://github.com/${{ github.repository }}/releases/download/${{ steps.version.outputs.TAG_NAME }}/conduit-darwin-arm64) |
| Windows | x86_64 (amd64) | [conduit-windows-amd64.exe](https://github.com/${{ github.repository }}/releases/download/${{ steps.version.outputs.TAG_NAME }}/conduit-windows-amd64.exe) |
Expand Down Expand Up @@ -297,7 +300,7 @@ jobs:
with:
context: ./cli
file: ./cli/Dockerfile
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/arm64,linux/arm/v7
push: true
tags: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
Expand All @@ -308,7 +311,7 @@ jobs:
with:
context: ./cli
file: ./cli/Dockerfile.distroless
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/arm64,linux/arm/v7
push: true
tags: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-distroless
Expand Down
13 changes: 10 additions & 3 deletions cli/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,16 @@ PSIPHON_REPO := https://github.com/ssmirr/psiphon-tunnel-core.git
# $(2) = extra build tag (optional, e.g. embed_config)
# $(3) = GOOS
# $(4) = GOARCH
# $(5) = GOARM (optional, for arm 32-bit builds)
define GO_BUILD
@BUILDDATE=$$(date +%Y-%m-%dT%H:%M:%S%z) && \
BUILDREPO=$$(cd psiphon-tunnel-core && git config --get remote.origin.url) && \
BUILDREV=$$(cd psiphon-tunnel-core && git rev-parse --short HEAD) && \
GOVERSION="$$($(GO) version | sed 's/go version //')" && \
ALL_TAGS="$(BASE_TAGS)" && \
if [ -n "$(2)" ]; then ALL_TAGS="$$ALL_TAGS,$(2)"; fi && \
echo "Building $(3)/$(4) -> $(1) with tags: $$ALL_TAGS" && \
CGO_ENABLED=0 GOOS=$(3) GOARCH=$(4) $(GO) build \
echo "Building $(3)/$(4)$(if $(5),v$(5),) -> $(1) with tags: $$ALL_TAGS" && \
CGO_ENABLED=0 GOOS=$(3) GOARCH=$(4) $(if $(5),GOARM=$(5),) $(GO) build \
-tags "$$ALL_TAGS" \
-ldflags "\
-s -w \
Expand Down Expand Up @@ -116,6 +117,9 @@ build-linux: check-go check-setup
build-linux-arm: check-go check-setup
$(call GO_BUILD,dist/conduit-linux-arm64,,linux,arm64)

build-linux-arm32: check-go check-setup
$(call GO_BUILD,dist/conduit-linux-arm,,linux,arm,7)

build-darwin: check-go check-setup
$(call GO_BUILD,dist/conduit-darwin-amd64,,darwin,amd64)

Expand All @@ -129,14 +133,15 @@ build-freebsd: check-go check-setup
$(call GO_BUILD,dist/conduit-freebsd-amd64,,freebsd,amd64)

# Build for all platforms
build-all: check-go check-setup build-linux build-linux-arm build-darwin build-darwin-arm build-windows build-freebsd
build-all: check-go check-setup build-linux build-linux-arm build-linux-arm32 build-darwin build-darwin-arm build-windows build-freebsd

# Build for all platforms with embedded config
build-all-embedded: check-go check-setup check-psiphon-config
@echo "Building all platforms with embedded config: $(PSIPHON_CONFIG)"
@cp "$(PSIPHON_CONFIG)" internal/config/psiphon_config.json
$(call GO_BUILD,dist/conduit-linux-amd64,$(EMBED_TAG),linux,amd64)
$(call GO_BUILD,dist/conduit-linux-arm64,$(EMBED_TAG),linux,arm64)
$(call GO_BUILD,dist/conduit-linux-arm,$(EMBED_TAG),linux,arm,7)
$(call GO_BUILD,dist/conduit-darwin-amd64,$(EMBED_TAG),darwin,amd64)
$(call GO_BUILD,dist/conduit-darwin-arm64,$(EMBED_TAG),darwin,arm64)
$(call GO_BUILD,dist/conduit-windows-amd64.exe,$(EMBED_TAG),windows,amd64)
Expand Down Expand Up @@ -189,6 +194,7 @@ docker: check-psiphon-config
@cp "$(PSIPHON_CONFIG)" internal/config/psiphon_config.json
$(call GO_BUILD,dist/conduit-linux-amd64,$(EMBED_TAG),linux,amd64)
$(call GO_BUILD,dist/conduit-linux-arm64,$(EMBED_TAG),linux,arm64)
$(call GO_BUILD,dist/conduit-linux-arm,$(EMBED_TAG),linux,arm,7)
@rm -f internal/config/psiphon_config.json
@echo "Building Debian Docker image..."
docker build -t $(DOCKER_IMAGE):latest -f Dockerfile .
Expand All @@ -202,6 +208,7 @@ docker-distroless: check-psiphon-config
@cp "$(PSIPHON_CONFIG)" internal/config/psiphon_config.json
$(call GO_BUILD,dist/conduit-linux-amd64,$(EMBED_TAG),linux,amd64)
$(call GO_BUILD,dist/conduit-linux-arm64,$(EMBED_TAG),linux,arm64)
$(call GO_BUILD,dist/conduit-linux-arm,$(EMBED_TAG),linux,arm,7)
@rm -f internal/config/psiphon_config.json
@echo "Building Distroless Docker image..."
docker build -t $(DOCKER_IMAGE):distroless -f Dockerfile.distroless .
Expand Down
Loading