From f66ee2c855981d2992fb9abcb6dd0d27054c1568 Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Tue, 29 Mar 2022 09:28:04 +0200
Subject: [PATCH] fix os-arch order

---
 .make/release.mk | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/.make/release.mk b/.make/release.mk
index 612b375373..7bccfc7b34 100644
--- a/.make/release.mk
+++ b/.make/release.mk
@@ -20,7 +20,7 @@ release-linux-docker-amd64: release-dirs
 		-buildmode=pie \
 		-trimpath \
 		-ldflags '-extldflags "-static" $(LDFLAGS) $(DOCKER_LDFLAGS)' \
-		-o '$(DIST)/binaries/$(EXECUTABLE)-amd64-linux' \
+		-o '$(DIST)/binaries/$(EXECUTABLE)-linux-amd64' \
 		./cmd/$(NAME)
 
 release-linux-docker-arm: release-dirs
@@ -30,7 +30,7 @@ release-linux-docker-arm: release-dirs
 		-tags 'netgo $(TAGS)' \
 		-trimpath \
 		-ldflags '-extldflags "-static" $(LDFLAGS) $(DOCKER_LDFLAGS)' \
-		-o '$(DIST)/binaries/$(EXECUTABLE)-arm-linux' \
+		-o '$(DIST)/binaries/$(EXECUTABLE)-linux-arm' \
 		./cmd/$(NAME)
 
 release-linux-docker-arm64: release-dirs
@@ -41,7 +41,7 @@ release-linux-docker-arm64: release-dirs
 		-buildmode=pie \
 		-trimpath \
 		-ldflags '-extldflags "-static" $(LDFLAGS) $(DOCKER_LDFLAGS)' \
-		-o '$(DIST)/binaries/$(EXECUTABLE)-arm64-linux' \
+		-o '$(DIST)/binaries/$(EXECUTABLE)-linux-arm64' \
 		./cmd/$(NAME)
 
 .PHONY: release-linux
@@ -53,17 +53,16 @@ release-linux: release-dirs
 		-buildmode=pie \
 		-trimpath \
 		-ldflags '-extldflags "-static" $(LDFLAGS)' \
-		-o '$(DIST)/binaries/$(EXECUTABLE)-amd64-linux' \
+		-o '$(DIST)/binaries/$(EXECUTABLE)-linux-amd64' \
 		./cmd/$(NAME)
 
 	GOOS=linux \
 	GOARCH=386 \
 	go build \
 		-tags 'netgo $(TAGS)' \
-		-buildmode=pie \
 		-trimpath \
 		-ldflags '-extldflags "-static" $(LDFLAGS)' \
-		-o '$(DIST)/binaries/$(EXECUTABLE)-386-linux' \
+		-o '$(DIST)/binaries/$(EXECUTABLE)-linux-386' \
 		./cmd/$(NAME)
 
 	GOOS=linux \
@@ -73,7 +72,7 @@ release-linux: release-dirs
 		-buildmode=pie \
 		-trimpath \
 		-ldflags '-extldflags "-static" $(LDFLAGS)' \
-		-o '$(DIST)/binaries/$(EXECUTABLE)-arm64-linux' \
+		-o '$(DIST)/binaries/$(EXECUTABLE)-linux-arm64' \
 		./cmd/$(NAME)
 
 	GOOS=linux \
@@ -82,7 +81,7 @@ release-linux: release-dirs
 		-tags 'netgo $(TAGS)' \
 		-trimpath \
 		-ldflags '-extldflags "-static" $(LDFLAGS)' \
-		-o '$(DIST)/binaries/$(EXECUTABLE)-arm-linux' \
+		-o '$(DIST)/binaries/$(EXECUTABLE)-linux-arm' \
 		./cmd/$(NAME)
 
 .PHONY: release-windows
@@ -94,7 +93,7 @@ release-windows: release-dirs
 		-buildmode=pie \
 		-trimpath \
 		-ldflags '-extldflags "-static" $(LDFLAGS)' \
-		-o '$(DIST)/binaries/$(EXECUTABLE)-amd64-windows' \
+		-o '$(DIST)/binaries/$(EXECUTABLE)-windows-amd64' \
 		./cmd/$(NAME)
 
 .PHONY: release-darwin
@@ -106,7 +105,7 @@ release-darwin: release-dirs
 		-buildmode=pie \
 		-trimpath \
 		-ldflags '$(LDFLAGS)' \
-		-o '$(DIST)/binaries/$(EXECUTABLE)-amd64-darwin' \
+		-o '$(DIST)/binaries/$(EXECUTABLE)-darwin-amd64' \
 		./cmd/$(NAME)
 
 	GOOS=darwin \
@@ -116,7 +115,7 @@ release-darwin: release-dirs
 		-buildmode=pie \
 		-trimpath \
 		-ldflags '$(LDFLAGS)' \
-		-o '$(DIST)/binaries/$(EXECUTABLE)-arm64-darwin' \
+		-o '$(DIST)/binaries/$(EXECUTABLE)-darwin-arm64' \
 		./cmd/$(NAME)
 
 .PHONY: release-copy