diff --git a/.github/workflows/01-powerpipe-release.yaml b/.github/workflows/01-powerpipe-release.yaml index 2afe4e02..b969c1bd 100644 --- a/.github/workflows/01-powerpipe-release.yaml +++ b/.github/workflows/01-powerpipe-release.yaml @@ -171,7 +171,7 @@ jobs: build_and_release: name: Build and Release Powerpipe needs: build_assets - runs-on: ubuntu-latest + runs-on: ubuntu-24.04-arm env: VERSION: ${{ needs.ensure_branch_in_homebrew.outputs.version }} steps: @@ -187,6 +187,20 @@ jobs: repository: turbot/pipe-fittings path: pipe-fittings + - name: Set up Docker + uses: docker/setup-buildx-action@v3 + + - name: Install Docker (if needed) + run: | + if ! command -v docker &> /dev/null; then + sudo apt-get update + sudo apt-get install -y docker.io + fi + + - name: Verify Docker installation + run: | + docker --version + - name: Calculate version id: calculate_version run: | diff --git a/.github/workflows/11-test-acceptance.yaml b/.github/workflows/11-test-acceptance.yaml index 07467629..7dbcb721 100644 --- a/.github/workflows/11-test-acceptance.yaml +++ b/.github/workflows/11-test-acceptance.yaml @@ -16,7 +16,7 @@ env: jobs: goreleaser: name: Build - runs-on: ubuntu-latest + runs-on: ubuntu-24.04-arm steps: - name: Checkout uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 @@ -31,6 +31,20 @@ jobs: path: pipe-fittings ref: develop + - name: Set up Docker + uses: docker/setup-buildx-action@v3 + + - name: Install Docker (if needed) + run: | + if ! command -v docker &> /dev/null; then + sudo apt-get update + sudo apt-get install -y docker.io + fi + + - name: Verify Docker installation + run: | + docker --version + # this is required, check golangci-lint-action docs - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: diff --git a/.goreleaser.yml b/.goreleaser.yml index 2230d3ac..454bf173 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -9,8 +9,11 @@ builds: - arm64 env: - - CC=aarch64-linux-gnu-gcc - - CXX=aarch64-linux-gnu-g++ + - CC=gcc + - CXX=g++ + - CGO_ENABLED=1 + - GOFLAGS= + - CGO_LDFLAGS= # Custom ldflags. # @@ -19,7 +22,9 @@ builds: ldflags: # Go Releaser analyzes your Git repository and identifies the most recent Git tag (typically the highest version number) as the version for your release. # This is how it determines the value of {{.Version}}. - - -s -w -X main.version={{.Version}} -X main.date={{.Date}} -X main.commit={{.Commit}} -X main.builtBy=goreleaser + - -s -w -X main.version={{.Version}} -X main.date={{.Date}} -X main.commit={{.Commit}} -X main.builtBy=goreleaser + + tags: [] - id: powerpipe-linux-amd64 binary: powerpipe @@ -31,9 +36,14 @@ builds: env: - CC=x86_64-linux-gnu-gcc - CXX=x86_64-linux-gnu-g++ + - CGO_ENABLED=1 + - GOFLAGS= + - CGO_LDFLAGS= ldflags: - - -s -w -X main.version={{.Version}} -X main.date={{.Date}} -X main.commit={{.Commit}} -X main.builtBy=goreleaser + - -s -w -X main.version={{.Version}} -X main.date={{.Date}} -X main.commit={{.Commit}} -X main.builtBy=goreleaser + + tags: [] - id: powerpipe-darwin-arm64 binary: powerpipe diff --git a/Makefile b/Makefile index b0c34832..92e18bee 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ OUTPUT_DIR?=/usr/local/bin PACKAGE_NAME := github.com/turbot/powerpipe -GOLANG_CROSS_VERSION ?= gcc13-osxcross-20250912194615 +GOLANG_CROSS_VERSION ?= gcc13-osxcross-20251006102018 .PHONY: build build: @@ -21,6 +21,7 @@ all: release-dry-run: @docker run \ --rm \ + --platform=linux/arm64 \ -e CGO_ENABLED=1 \ -v /var/run/docker.sock:/var/run/docker.sock \ -v `pwd`:/go/src/powerpipe \ @@ -38,6 +39,7 @@ release: fi docker run \ --rm \ + --platform=linux/arm64 \ -e CGO_ENABLED=1 \ --env-file .release-env \ -v /var/run/docker.sock:/var/run/docker.sock \