From 0a0cc3ce1e29c3d8da2ae4826aa00f6eb16a36b1 Mon Sep 17 00:00:00 2001
From: hunterlong <info@socialeck.com>
Date: Mon, 4 May 2020 19:46:49 -0700
Subject: [PATCH] force CGO_ENABLED=1 for arm builds, test fix (logout)

---
 Makefile               | 6 +++---
 handlers/users_test.go | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 71f1d085..11c1761e 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ build-linux:
 		do \
 			echo "Building v$$VERSION for $$os-$$arch"; \
 			mkdir -p releases/statping-$$os-$$arch/; \
-			GO111MODULE="on" GOOS=$$os GOARCH=$$arch go build -a -ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT)" -o releases/statping-$$os-$$arch/statping ${PWD}/cmd || true; \
+			CGO_ENABLED=1 GO111MODULE="on" GOOS=$$os GOARCH=$$arch go build -a -ldflags "-X main.VERSION=${VERSION}" -o releases/statping-$$os-$$arch/statping ${PWD}/cmd || true; \
 			chmod +x releases/statping-$$os-$$arch/statping || true; \
 			tar -czf releases/statping-$$os-$$arch.tar.gz -C releases/statping-$$os-$$arch statping || true; \
 		done \
@@ -174,7 +174,7 @@ build-mac:
 	do \
 		echo "Building v$$VERSION for darwin-$$arch"; \
 		mkdir -p releases/statping-darwin-$$arch/; \
-		GO111MODULE="on" GOOS=darwin GOARCH=$$arch go build -a -ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT)" -o releases/statping-darwin-$$arch/statping ${PWD}/cmd || true; \
+		CGO_ENABLED=1 GO111MODULE="on" GOOS=darwin GOARCH=$$arch go build -a -ldflags "-X main.VERSION=${VERSION}" -o releases/statping-darwin-$$arch/statping ${PWD}/cmd || true; \
 		chmod +x releases/statping-darwin-$$arch/statping || true; \
 		tar -czf releases/statping-darwin-$$arch.tar.gz -C releases/statping-darwin-$$arch statping || true; \
 	done
@@ -187,7 +187,7 @@ build-win:
 	do \
 		echo "Building v$$VERSION for windows-$$arch"; \
 		mkdir -p releases/statping-windows-$$arch/; \
-		GO111MODULE="on" GOOS=windows GOARCH=$$arch go build -a -ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT)" -o releases/statping-windows-$$arch/statping.exe ${PWD}/cmd || true; \
+		CGO_ENABLED=1 GO111MODULE="on" GOOS=windows GOARCH=$$arch go build -a -ldflags "-X main.VERSION=${VERSION}" -o releases/statping-windows-$$arch/statping.exe ${PWD}/cmd || true; \
 		chmod +x releases/statping-windows-$$arch/statping.exe || true; \
 		zip -j releases/statping-windows-$$arch.zip releases/statping-windows-$$arch/statping.exe || true; \
 	done
diff --git a/handlers/users_test.go b/handlers/users_test.go
index 51bdc8b9..4ecd6b84 100644
--- a/handlers/users_test.go
+++ b/handlers/users_test.go
@@ -148,9 +148,8 @@ func TestApiUsersRoutes(t *testing.T) {
 			Name:           "Statping Logout",
 			URL:            "/api/logout",
 			Method:         "GET",
-			ExpectedStatus: 303,
-		},
-		{
+			ExpectedStatus: 200,
+		}, {
 			Name:             "Incorrect JSON POST",
 			URL:              "/api/users",
 			Body:             BadJSON,