Fix arm builds

Something changed on goreleaser and the automatic GOARCH detection didn't work. This PR fixes that. Previous releases (rc15 and rc16) arm builds won't work, please make a new release @laskoviymishka. --- Pull Request resolved: #189 Co-authored-by: tserakhau <[email protected]> commit_hash:ea0e0d1a63d99a20acae21c3e2b6971b77674a19
doublecloud · Jan 29, 2025 · 07d3005 · 07d3005
1 parent 031eea6
commit 07d3005
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -42,7 +42,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
           version: latest

diff --git a/goreleaser.yaml → .goreleaser.yaml b/goreleaser.yaml → .goreleaser.yaml
@@ -1,12 +1,12 @@
 # vim: set ts=2 sw=2 tw=0 fo=cnqoj
 
-version: 1
+version: 2
 project_name: "transfer"
 
-#before:
-#  hooks:
-#    - go mod tidy
-#    - go generate ./...
+before:
+  hooks:
+    - go mod tidy
+    - go generate ./...
 
 builds:
   - env:
@@ -16,18 +16,15 @@ builds:
     goarch:
       - amd64
       - arm64
-    goarm:
-      - 8
     main: ./cmd/trcli
     binary: trcli
 
 archives:
-  - format: tar.gz
+  - formats: ["tar.gz"]
     name_template: >-
       {{ .ProjectName }}_
       {{- .Os }}_
       {{- .Arch }}
-      {{- if .Arm }}v{{ .Arm }}{{ end }}
 
 changelog:
   sort: asc
@@ -46,18 +43,22 @@ release:
 dockers:
   - image_templates:
       - "ghcr.io/doublecloud/transfer:{{.Version}}-amd64"
+    goos: linux
+    goarch: amd64
     use: buildx
     dockerfile: Dockerfile
     build_flag_templates:
       - "--platform=linux/amd64"
   - image_templates:
-      - "ghcr.io/doublecloud/transfer:{{.Version}}-arm64v8"
+      - "ghcr.io/doublecloud/transfer:{{.Version}}-arm64"
+    goos: linux
+    goarch: arm64
     use: buildx
     dockerfile: Dockerfile
     build_flag_templates:
-      - "--platform=linux/arm64/v8"
+      - "--platform=linux/arm64"
 docker_manifests:
   - name_template: "ghcr.io/doublecloud/transfer:{{.Version}}"
     image_templates:
       - "ghcr.io/doublecloud/transfer:{{.Version}}-amd64"
-      - "ghcr.io/doublecloud/transfer:{{.Version}}-arm64v8"
+      - "ghcr.io/doublecloud/transfer:{{.Version}}-arm64"
diff --git a/.mapping.json b/.mapping.json
@@ -10,6 +10,7 @@
   ".github/workflows/release-website.yml":"cloud/doublecloud/transfer/github_os/.github/workflows/release-website.yml",
   ".github/workflows/release.yml":"cloud/doublecloud/transfer/github_os/.github/workflows/release.yml",
   ".gitignore":"cloud/doublecloud/transfer/github_os/.gitignore",
+  ".goreleaser.yaml":"cloud/doublecloud/transfer/github_os/.goreleaser.yaml",
   "CONTRIBUTING.md":"cloud/doublecloud/transfer/github_os/CONTRIBUTING.md",
   "Dockerfile":"cloud/doublecloud/transfer/github_os/Dockerfile",
   "GLOSSARY.md":"transfer_manager/go/GLOSSARY.md",
@@ -49,6 +50,7 @@
   "cloud/doublecloud/transfer/github_os/.github/workflows/release-website.yml":"cloud/doublecloud/transfer/github_os/.github/workflows/release-website.yml",
   "cloud/doublecloud/transfer/github_os/.github/workflows/release.yml":"cloud/doublecloud/transfer/github_os/.github/workflows/release.yml",
   "cloud/doublecloud/transfer/github_os/.gitignore":"cloud/doublecloud/transfer/github_os/.gitignore",
+  "cloud/doublecloud/transfer/github_os/.goreleaser.yaml":"cloud/doublecloud/transfer/github_os/.goreleaser.yaml",
   "cloud/doublecloud/transfer/github_os/CONTRIBUTING.md":"cloud/doublecloud/transfer/github_os/CONTRIBUTING.md",
   "cloud/doublecloud/transfer/github_os/Dockerfile":"cloud/doublecloud/transfer/github_os/Dockerfile",
   "cloud/doublecloud/transfer/github_os/LICENSE":"cloud/doublecloud/transfer/github_os/LICENSE",
@@ -241,7 +243,6 @@
   "cloud/doublecloud/transfer/github_os/examples/s3sqs2ch/main.tf":"cloud/doublecloud/transfer/github_os/examples/s3sqs2ch/main.tf",
   "cloud/doublecloud/transfer/github_os/examples/s3sqs2ch/transfer.yaml":"cloud/doublecloud/transfer/github_os/examples/s3sqs2ch/transfer.yaml",
   "cloud/doublecloud/transfer/github_os/examples/s3sqs2ch/variables.tf":"cloud/doublecloud/transfer/github_os/examples/s3sqs2ch/variables.tf",
-  "cloud/doublecloud/transfer/github_os/goreleaser.yaml":"cloud/doublecloud/transfer/github_os/goreleaser.yaml",
   "cloud/doublecloud/transfer/github_os/helm/README.md":"cloud/doublecloud/transfer/github_os/helm/README.md",
   "cloud/doublecloud/transfer/github_os/helm/transfer/Chart.yaml":"cloud/doublecloud/transfer/github_os/helm/transfer/Chart.yaml",
   "cloud/doublecloud/transfer/github_os/helm/transfer/templates/_helpers.tpl":"cloud/doublecloud/transfer/github_os/helm/transfer/templates/_helpers.tpl",
@@ -468,7 +469,6 @@
   "examples/s3sqs2ch/variables.tf":"cloud/doublecloud/transfer/github_os/examples/s3sqs2ch/variables.tf",
   "go.mod":"",
   "go.sum":"",
-  "goreleaser.yaml":"cloud/doublecloud/transfer/github_os/goreleaser.yaml",
   "helm":"cloud/doublecloud/transfer/github_os/helm",
   "helm/README.md":"cloud/doublecloud/transfer/github_os/helm/README.md",
   "helm/transfer/Chart.yaml":"cloud/doublecloud/transfer/github_os/helm/transfer/Chart.yaml",

diff --git a/Dockerfile b/Dockerfile
@@ -59,7 +59,7 @@ VOLUME /var/lib/docker
 # Create a non-root user and group
 RUN addgroup --system trcligroup && adduser --system --ingroup trcligroup trcliuser
 
-# Copy the Go binary from Stage 1 (builder)
+# Copy the Go binary
 COPY trcli /usr/local/bin/trcli
 
 RUN chmod +x /usr/local/bin/trcli