From d5ad717ecab1f67b3ae58ebdaaea4fae11b94881 Mon Sep 17 00:00:00 2001
From: Andreas Linde <42185+DerAndereAndi@users.noreply.github.com>
Date: Sun, 5 Dec 2021 18:58:04 +0100
Subject: [PATCH] Add armv7 architecture go get armhf deb packages (#1990)

- Don't push armv6 deb packages, as goreleaser right now incorrectly makes `armel` instead of `armhf` packages
- Added armv7 builds and use that for debian packages
---
 .github/workflows/nightly.yml | 7 +++++++
 .github/workflows/release.yml | 7 +++++++
 .goreleaser-nightly.yml       | 5 +++--
 .goreleaser.yml               | 1 +
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index ee2edfbe4..2f1e22e1a 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -106,6 +106,13 @@ jobs:
         CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
       run: |
         for filename in release/*.deb; do
+          # goreleaser creates armel packages for armv6, which is wrong
+          # until this is fixed, ignore armv6 
+          if [[ "$filename" == *"armv6"* ]]; then
+            echo "Skipping $filename"
+            continue
+          fi
+
           echo "Pushing $filename to 'unstable'"
           cloudsmith push deb evcc/unstable/any-distro/any-version $filename
         done
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1fd321cf1..19cd85da3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -99,6 +99,13 @@ jobs:
         CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
       run: |
         for filename in release/*.deb; do
+          # goreleaser creates armel packages for armv6, which is wrong
+          # until this is fixed, ignore armv6 
+          if [[ "$filename" == *"armv6"* ]]; then
+            echo "Skipping $filename"
+            continue
+          fi
+
           echo "Pushing $filename to 'stable'"
           cloudsmith push deb evcc/stable/any-distro/any-version $filename
         done
\ No newline at end of file
diff --git a/.goreleaser-nightly.yml b/.goreleaser-nightly.yml
index 89a2c1c19..3c2f0fc0e 100644
--- a/.goreleaser-nightly.yml
+++ b/.goreleaser-nightly.yml
@@ -20,6 +20,7 @@ builds:
   - arm64
   goarm:
   - "6"
+  - "7"
 archives:
 - builds:
   - evcc
@@ -31,7 +32,7 @@ archives:
     format: zip
   files:
   - evcc.dist.yaml
-  name_template: "{{.ProjectName}}_{{ .Version }}.{{.Timestamp}}_{{.Os}}-{{.Arch}}"
+  name_template: "{{.ProjectName}}_{{ .Version }}.{{.Timestamp}}_{{.Os}}-{{.Arch}}{{ if .Arm }}v{{ .Arm }}{{ end }}"
 universal_binaries:
 - replace: true
 checksum:
@@ -41,7 +42,7 @@ snapshot:
 nfpms:
   - id: default
     package_name: evcc
-    file_name_template: "{{.ProjectName}}_{{ .Version }}.{{.Timestamp}}_{{.Os}}-{{.Arch}}"
+    file_name_template: "{{.ProjectName}}_{{ .Version }}.{{.Timestamp}}_{{.Os}}-{{.Arch}}{{ if .Arm }}v{{ .Arm }}{{ end }}"
 
     homepage:  https://evcc.io
     description: EV Charge Controller
diff --git a/.goreleaser.yml b/.goreleaser.yml
index f261364ae..961203997 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -25,6 +25,7 @@ builds:
   - arm64
   goarm:
   - "6"
+  - "7"
 archives:
 - builds:
   - evcc