Merge branch 'master' into xela92-github-action-test

Makefile

@@ -12,8 +12,6 @@ client-windows-i386:
 	GOOS=windows GOARCH=386 ./build-scripts/build.sh client
 client-windows-amd64:
 	GOOS=windows GOARCH=amd64 ./build-scripts/build.sh client
-client-darwin-i386:
-	GOOS=darwin GOARCH=386 ./build-scripts/build.sh client
 client-darwin-amd64:
 	GOOS=darwin GOARCH=amd64 ./build-scripts/build.sh client
 
@@ -28,8 +26,6 @@ server-windows-i386:
 	GOOS=windows GOARCH=386 ./build-scripts/build.sh server
 server-windows-amd64:
 	GOOS=windows GOARCH=amd64 ./build-scripts/build.sh server
-server-darwin-i386:
-	GOOS=darwin GOARCH=386 ./build-scripts/build.sh server
 server-darwin-amd64:
 	GOOS=darwin GOARCH=amd64 ./build-scripts/build.sh server
 
@@ -52,17 +48,16 @@ linux-amd64: client-linux-amd64 server-linux-amd64
 linux-arm: client-linux-arm server-linux-arm
 windows-i386: client-windows-i386 server-windows-i386
 windows-amd64: client-windows-amd64 server-windows-amd64
-darwin-i386: client-darwin-i386 server-darwin-i386
 darwin-amd64: client-darwin-amd64 server-darwin-amd64
 linux: linux-i386 linux-amd64 linux-arm
 windows: windows-i386 windows-amd64
-darwin: darwin-i386 darwin-amd64
+darwin: darwin-amd64
 
 # Type-specific builds
-client-i386: client-linux-i386 client-windows-i386 client-darwin-i386
+client-i386: client-linux-i386 client-windows-i386
 client-amd64: client-linux-amd64 client-windows-amd64 client-darwin-amd64
 client-arm: client-linux-arm
-server-i386: server-linux-i386 server-windows-i386 server-darwin-i386
+server-i386: server-linux-i386 server-windows-i386
 server-amd64: server-linux-amd64 server-windows-amd64 server-darwin-amd64
 server-arm: server-linux-arm
 client: client-i386 client-amd64 client-arm