Address review issues

Signed-off-by: Kemal Akkoyun <[email protected]>

Author: kakkoyun

.github/workflows/build.yml

@@ -99,18 +99,15 @@ jobs:
       - name: Test
         run: make test ENABLE_RACE=yes
 
-      - name: Install gofumpt
-        run: go install mvdan.cc/gofumpt@${{ env.GOFUMPT_VERSION }}
-
       - name: Format
         run: |
           make format
           git diff --exit-code
 
-      - name: Install golangci-lint
-        run: |
-          curl -sSfL 'https://raw.githubusercontent.com/golangci/golangci-lint/${{ env.GOLANGCI_LINT_VERSION }}/install.sh' \
-            | sh -s -- -b "$(go env GOPATH)/bin" '${{ env.GOLANGCI_LINT_VERSION }}'
-
       - name: Vet
-        run: make vet lint
+        run: make vet
+
+      - name: Lint
+        uses: golangci/golangci-lint-action@537aa1903e5d359d0b27dbc19ddd22c5087f3fbc # tag=v3.2.0
+        with:
+          version: ${{ env.GOLANGCI_LINT_VERSION }}

.github/workflows/container.yml

@@ -95,12 +95,19 @@ jobs:
           path: pkg/profiler/cpu-profiler.bpf.o
           if-no-files-found: error
 
+      - name: Validate
+        uses: goreleaser/goreleaser-action@68acf3b1adf004ac9c2f0a4259e85c5f66e99bef # tag=v3.0.0
+        with:
+          distribution: goreleaser
+          version: ${{ env.GORELEASER_VERSION }}
+          args: check
+
   build-binaries:
     name: Build binaries using goreleaser
     runs-on: ubuntu-latest
     needs: build-dependencies
     container:
-      image: goreleaser/goreleaser-cross:v1.18.3 # ${{ env.GORELEASER_CROSS_VERSION }}
+      image: docker.io/goreleaser/goreleaser-cross:v1.18.3
       options: --privileged
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -127,7 +134,7 @@ jobs:
           path: pkg/profiler/cpu-profiler.bpf.o
 
       - name: Run Goreleaser
-        run: goreleaser build --rm-dist --skip-validate --snapshot
+        run: goreleaser release --rm-dist --skip-validate --skip-publish --snapshot --debug
 
       - name: Archive generated artifacts
         uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # tag=v3.1.0
@@ -145,7 +152,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       # https://github.com/containers/podman/tree/main/contrib/podmanimage
-      image: quay.io/containers/podman:v4.1.1@sha256:0e3ae4bd8ab6967eeeec2e3dfc51106112f34068027ab4087c21313135641634
+      image: quay.io/containers/podman:v4.1.1@sha256:421ac576cebff98e90c531e7b9ce4482370ecc7cee59abc2341714031bfb5f43
       options: >-
         --device /dev/fuse:rw
         --privileged

.github/workflows/release-dry-run.yml

@@ -63,7 +63,7 @@ jobs:
     needs: dependencies
     if: startsWith(github.ref, 'refs/tags/')
     container:
-      image: goreleaser/goreleaser-cross:v1.18.3 # ${{ env.GORELEASER_CROSS_VERSION }}
+      image: docker.io/goreleaser/goreleaser-cross:v1.18.3
       options: --privileged
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -154,7 +154,7 @@ jobs:
     needs: binaries
     container:
       # https://github.com/containers/podman/tree/main/contrib/podmanimage
-      image: quay.io/containers/podman:v4.1.1@sha256:0e3ae4bd8ab6967eeeec2e3dfc51106112f34068027ab4087c21313135641634
+      image: quay.io/containers/podman:v4.1.1@sha256:421ac576cebff98e90c531e7b9ce4482370ecc7cee59abc2341714031bfb5f43
       options: >-
         --device /dev/fuse:rw
         --privileged

.github/workflows/release.yml

@@ -1,13 +1,20 @@
-FROM --platform="${BUILDPLATFORM:-linux/amd64}" docker.io/golang:1.18.3-bullseye@sha256:d146bc2ee9b0691f4f787bd9a8bf12e3c01a4618ea982d11fe9401b86211e2a7 AS builder
-RUN mkdir /.cache && chown nobody:nogroup /.cache && touch -t 202101010000.00 /.cache
+FROM --platform="${BUILDPLATFORM:-linux/amd64}" docker.io/library/busybox:1.35.0 as builder
+RUN mkdir /.cache && touch -t 202101010000.00 /.cache
+
+ARG TARGETOS=linux
+ARG TARGETARCH=amd64
+ARG TARGETVARIANT
 
 WORKDIR /app
+COPY dist dist
 
-COPY ./dist /app/dist
-RUN if [ "amd64" = "$(go env GOARCH)" ]; then \
-        cp "dist/parca-agent-amd64_$(go env GOOS)_$(go env GOARCH)_$(go env GOAMD64)/parca-agent" parca-agent; \
+# NOTICE: See goreleaser.yml for the build paths.
+RUN if [ "${TARGETARCH}" == 'amd64' ]; then \
+        cp "dist/parca-agent-${TARGETARCH}_${TARGETOS}_${TARGETARCH}_${TARGETVARIANT:-v1}/parca-agent" . ; \
+    elif [ "${TARGETARCH}" == 'arm' ]; then \
+        cp "dist/parca-agent-${TARGETARCH}_${TARGETOS}_${TARGETARCH}_${TARGETVARIANT##v}/parca-agent" . ; \
     else \
-        cp "dist/parca-agent-arm64_$(go env GOOS)_$(go env GOARCH)/parca-agent" parca-agent; \
+        cp "dist/parca-agent-${TARGETARCH}_${TARGETOS}_${TARGETARCH}/parca-agent" . ; \
     fi
 
 FROM --platform="${TARGETPLATFORM:-linux/amd64}" gcr.io/distroless/static@sha256:2ad95019a0cbf07e0f917134f97dd859aaccc09258eb94edcb91674b3c1f448f

Dockerfile

@@ -1,5 +1,5 @@
 ARG GOLANG_CROSS_VERSION
-FROM --platform="${BUILDPLATFORM:-linux/amd64}" goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION}
+FROM --platform="${BUILDPLATFORM:-linux/amd64}" docker.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION}
 
 RUN apt-get update -y && \
     apt-get install -yq libelf-dev zlib1g-dev \

Dockerfile.cross-builder

@@ -36,7 +36,7 @@ else
 endif
 VERSION ?= $(if $(RELEASE_TAG),$(RELEASE_TAG),$(shell $(CMD_GIT) describe --tags 2>/dev/null || echo '$(BRANCH)$(COMMIT)'))
 
-# renovate: datasource=go depName=github.com/goreleaser/goreleaser-cross
+# renovate: datasource=docker depName=docker.io/goreleaser/goreleaser-cross
 GOLANG_CROSS_VERSION := v1.18.3
 
 # inputs and outputs:
@@ -45,7 +45,6 @@ GO_SRC := $(shell find . -type f -name '*.go')
 OUT_BIN := $(OUT_DIR)/parca-agent
 OUT_BIN_DEBUG_INFO := $(OUT_DIR)/debug-info
 OUT_DOCKER ?= ghcr.io/parca-dev/parca-agent
-# TODO(kakkoyun): Consider creating parca-dev/cross-builder repo.
 DOCKER_BUILDER ?= parca-dev/cross-builder
 
 LIBBPF_SRC := 3rdparty/libbpf/src
@@ -203,7 +202,6 @@ bpf/fmt:
 
 .PHONY: go/fmt
 go/fmt:
-	gofumpt -l -w $(shell $(GO) list ./... | grep -E -v "internal/pprof|internal/go" | sed 's#^github.com/parca-dev/parca-agent/##')
 	$(GO) fmt $(shell $(GO) list ./... | grep -E -v "internal/pprof|internal/go")
 
 .PHONY: vet
@@ -316,7 +314,7 @@ release-dry-run: $(DOCKER_BUILDER) bpf
 		--rm \
 		--privileged \
 		-v /var/run/docker.sock:/var/run/docker.sock \
-		-v `pwd`:/__w/parca-agent/parca-agent \
+		-v "$(PWD):/__w/parca-agent/parca-agent" \
 		-w /__w/parca-agent/parca-agent \
 		$(DOCKER_BUILDER):$(GOLANG_CROSS_VERSION) \
 		release --rm-dist --auto-snapshot --skip-validate --skip-publish --debug
@@ -327,7 +325,7 @@ release-build: $(DOCKER_BUILDER) bpf
 		--rm \
 		--privileged \
 		-v /var/run/docker.sock:/var/run/docker.sock \
-		-v `pwd`:/__w/parca-agent/parca-agent \
+		-v "$(PWD):/__w/parca-agent/parca-agent" \
 		-w /__w/parca-agent/parca-agent \
 		$(DOCKER_BUILDER):$(GOLANG_CROSS_VERSION) \
 		build --rm-dist --skip-validate --snapshot --debug