Update binary and image build process (#490)

## Description


Binary and container image builds are only run on a merge into main. We should be testing this on all PRs. Also, the binary and image builds on main take almost 20mins to run. This PR is to speed up binary and image builds and to have them run on all PRs.

Fixes: #

## How Has This Been Tested?





## How are existing users impacted? What migration steps/scripts do we need?





## Checklist:

I have:

- [ ] updated the documentation and/or roadmap (if required)
- [ ] added unit or e2e tests
- [ ] provided instructions on how to upgrade

Author: mergify[bot]

.github/workflows/ci.yaml

@@ -7,7 +7,7 @@ on:
 
 env:
   CGO_ENABLED: 0
-  GO_VERSION: '1.24'
+  GO_VERSION: '1.25'
   REGISTRY: ghcr.io
   # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
@@ -51,49 +51,19 @@ jobs:
         with:
           check_filenames: true
           check_hidden: true
-          skip: "./.git,./go.mod,./go.sum"
+          skip: "./.git,./go.mod,./go.sum,.goreleaser.yaml"
           ignore_words_list: ro,NotIn
 
-  build-and-push-image:
-    name: Build and push manager image
+  build:
+    name: Build binaries and container images
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
     steps:
-    - name: Checkout
-      uses: actions/checkout@v5
-    
-    - name: Login to ghcr.io
-      if: github.event_name != 'pull_request'
-      uses: docker/login-action@v3
-      with:
-        registry: ${{ env.REGISTRY }}
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Extract metadata (tags, labels) for Docker
-      id: meta
-      uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
-      with:
-        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-        tags: |
-            type=sha
-            type=raw,value=latest
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
+      - uses: actions/checkout@v5
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      - uses: actions/setup-go@v6
+        with:
+          go-version: "${{ env.GO_VERSION }}"
+          cache: true
 
-    - name: Build and push Docker image
-      id: build-and-push
-      uses: docker/build-push-action@v6
-      with:
-        context: .
-        push: ${{ github.event_name != 'pull_request' }}
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
-        platforms: ${{ github.event_name != 'pull_request' && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
+      - name: Build
+        run: make build-image

.github/workflows/release.yaml

@@ -1,17 +1,21 @@
-# workflow to release assets as part of the release
-name: Upload Release Asset
+name: Release Workflow
 on:
   push:
     tags:
       - "v*"
 env:
+  CGO_ENABLED: 0
+  GO_VERSION: '1.25'
   REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
-  GO_VERSION: '1.24'
+
+permissions:
+  contents: write
 
 jobs:
-  manager-image:
-    name: Build and push manager image
+  build-image:
+    name: Build and push image
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -22,92 +26,27 @@ jobs:
           go-version: "${{ env.GO_VERSION }}"
           cache: true
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Cache Docker layers
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-manager-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-manager-
-            ${{ runner.os }}-buildx-
-
-      - name: Docker manager metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          flavor: latest=false
-          tags: type=ref,event=tag
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push manager image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: true
-          build-args: |
-            LDFLAGS=${{ env.DOCKER_BUILD_LDFLAGS }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-
-      - name: Move cache
-        # Temp fix
-        # https://github.com/docker/build-push-action/issues/252
-        # https://github.com/moby/buildkit/issues/1896
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+      - name: Build and push image
+        run: make image-build-push
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   release:
     name: Release
     runs-on: ubuntu-latest
     needs:
-      - manager-image
+      - build-image
     steps:
-      - uses: actions/checkout@v5
+      - name: Checkout code
+        uses: actions/checkout@v5
 
       - uses: actions/setup-go@v6
         with:
           go-version: "${{ env.GO_VERSION }}"
           cache: true
 
-      - uses: actions/cache@v4
-        with:
-          path: bin
-          key: ${{ runner.os }}-tools-bin-release-${{ hashFiles('Makefile') }}
-          restore-keys: |
-            ${{ runner.os }}-tools-bin-release-
-            ${{ runner.os }}-tools-bin-
-
-      - name: Docker manager metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          flavor: latest=false
-          tags: type=ref,event=tag
-
-      - name: manifest
+      - name: Create manifests
         run: make release
-        env:
-          TAG: ${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
 
       - name: Generate Release Notes
         run: |
@@ -120,7 +59,7 @@ jobs:
           OWNER: ${{ github.repository_owner }}
           REPO: ${{ github.event.repository.name }}
 
-      - name: Create Release
+      - name: Create GitHub Release
         id: create_release
         uses: softprops/action-gh-release@v2
         env:

.gitignore

@@ -43,3 +43,5 @@ dist
 
 # development / test / lints
 bin/
+# Added by goreleaser init:
+dist/

.goreleaser.yaml

@@ -0,0 +1,46 @@
+version: 2
+
+env:
+  - REGISTRY={{ if index .Env "REGISTRY"  }}{{ .Env.REGISTRY }}{{ else }}ghcr.io{{ end }}
+  - IMAGE_NAME={{ if index .Env "IMAGE_NAME"  }}{{ .Env.IMAGE_NAME }}{{ else }}tinkerbell/cluster-api-provider-tinkerbell{{ end }}
+  - BINARY=capt
+
+before:
+  hooks:
+    - go mod tidy
+
+builds:
+  - id: build
+    binary: "{{ .Env.BINARY }}"
+    env:
+    - CGO_ENABLED=0
+    goos:
+    - linux
+    ldflags:
+    - -s -w
+    goarch:
+    - amd64
+    - arm64
+
+checksum:
+  name_template: 'checksums.txt'
+
+archives:
+  - formats:
+    - binary
+
+release:
+  disable: true
+
+dockers_v2:
+  - images:
+      - "{{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}"
+    tags:
+      - "v{{ .Version }}"
+      - "{{ if not .IsNightly }}latest{{ end }}"
+    labels:
+      "org.opencontainers.image.created": "{{.Date}}"
+      "org.opencontainers.image.name": "{{.ProjectName}}"
+      "org.opencontainers.image.revision": "{{.FullCommit}}"
+      "org.opencontainers.image.version": "v{{.Version}}"
+      "org.opencontainers.image.source": "{{.GitURL}}"

Dockerfile

@@ -12,35 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Build the manager binary
-ARG GOVER=1.24
-FROM golang:${GOVER} AS builder
-
-WORKDIR /workspace
-
-# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
-ARG goproxy=https://proxy.golang.org
-ENV GOPROXY=$goproxy
-
-# Copy the Go Modules manifests
-COPY go.mod go.mod
-COPY go.sum go.sum
-# cache deps before building and copying source so that we don't need to re-download as much
-# and so that source changes don't invalidate our downloaded layer
-RUN go mod download
-
-# Copy the sources
-COPY ./ ./
-
-# Build
-ARG ARCH
-ARG LDFLAGS
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -a -ldflags="${LDFLAGS}" -o manager .
-
-# Use distroless as minimal base image to package the manager binary
-# Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM gcr.io/distroless/static:nonroot
-WORKDIR /
-COPY --from=builder /workspace/manager .
+ARG TARGETPLATFORM
+COPY ${TARGETPLATFORM}/capt /capt
 USER nonroot:nonroot
-ENTRYPOINT ["/manager"]
+ENTRYPOINT ["/capt"]