From 4133b1ea6590a4ca4b76cc11bdcf86bb964b7a57 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Tue, 29 Dec 2020 11:11:50 +0100
Subject: [PATCH] Synchronize OS and architectures for testing

---
 .github/workflows/tests.yml            | 13 ++++++-------
 helpers/build-release-binaries/main.go |  3 +++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 19fde6bfb..e99bc2864 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -211,15 +211,14 @@ jobs:
       - name: Cross-compile with gox
         env:
           GOFLAGS: "-trimpath"
-          GOX_ARCHS: "linux/386 linux/amd64 \
-            windows/386 windows/amd64 \
+          GOX_ARCHS: "aix/ppc64 \
             darwin/amd64 \
-            freebsd/386 freebsd/amd64 \
-            openbsd/386 openbsd/amd64 \
+            freebsd/386 freebsd/amd64 freebsd/arm \
+            linux/386 linux/amd64 linux/arm linux/arm64 linux/ppc64le \
             netbsd/386 netbsd/amd64 \
-            linux/arm freebsd/arm \
-            linux/ppc64le solaris/amd64 \
-            aix/ppc64"
+            openbsd/386 openbsd/amd64 \
+            windows/386 windows/amd64 \
+            solaris/amd64"
         run: |
           mkdir build-output
           gox -parallel 2 -verbose -osarch "$GOX_ARCHS" -output "build-output/{{.Dir}}_{{.OS}}_{{.Arch}}" ./cmd/restic
diff --git a/helpers/build-release-binaries/main.go b/helpers/build-release-binaries/main.go
index 96c8bd1f9..f299a0b1e 100644
--- a/helpers/build-release-binaries/main.go
+++ b/helpers/build-release-binaries/main.go
@@ -222,11 +222,14 @@ func buildTargets(sourceDir, outputDir string, targets map[string][]string) {
 }
 
 var defaultBuildTargets = map[string][]string{
+	"aix":     {"ppc64"},
 	"darwin":  {"amd64"},
 	"freebsd": {"386", "amd64", "arm"},
 	"linux":   {"386", "amd64", "arm", "arm64", "ppc64le"},
+	"netbsd":  {"386", "amd64"},
 	"openbsd": {"386", "amd64"},
 	"windows": {"386", "amd64"},
+	"solaris": {"amd64"},
 }
 
 func main() {