chore(core): establish bin/ and dist/ artifact separation (#256)

Author: victoriacheng15

.github/workflows/deploy.yml

@@ -5,6 +5,7 @@ on:
     branches: ["main"]
     paths:
       - "cmd/web/**"
+      - "internal/web/**"
   workflow_dispatch:
 
 permissions:
@@ -36,7 +37,7 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v4
         with:
-          path: ./cmd/web/dist
+          path: ./dist
 
   deploy:
     runs-on: ubuntu-latest

cmd/web/main.go

@@ -8,7 +8,7 @@ import (
 )
 
 func main() {
-	if err := generator.Build("../../internal/web", "dist"); err != nil {
+	if err := generator.Build("../../internal/web", "../../dist"); err != nil {
 		log.Fatalf("Site generation failed: %v", err)
 	}
 	fmt.Println("Site generated successfully in dist/")

makefiles/go.mk

@@ -55,22 +55,22 @@ setup-tailwind:
 
 web-build: setup-tailwind
 	$(NIX_WRAP) echo "Running web build..." && \
-	rm -rf cmd/web/dist && \
-	mkdir -p cmd/web/dist && \
+	rm -rf dist && \
+	mkdir -p dist && \
 	(cd cmd/web && go build -o ../../web-ssg .) && \
 	(cd cmd/web && ../../web-ssg) && \
-	./tailwindcss -i ./internal/web/templates/input.css -o ./cmd/web/dist/styles.css --minify && \
+	./tailwindcss -i ./internal/web/templates/input.css -o ./dist/styles.css --minify && \
 	rm web-ssg && \
 	rm tailwindcss
 
 proxy-build:
 	$(NIX_WRAP) \
 	echo "Updating Proxy..." && \
-	cd cmd/proxy && go build -o ../../dist/proxy_server . && \
+	cd cmd/proxy && go build -o ../../bin/proxy_server . && \
 	sudo systemctl restart proxy.service
 
 ingestion-build:
 	$(NIX_WRAP) \
 	echo "Updating ingestion service..." && \
-	cd cmd/ingestion && go build -o ../../dist/ingestion . && \
+	cd cmd/ingestion && go build -o ../../bin/ingestion . && \
 	sudo systemctl restart ingestion.timer

systemd/ingestion.service

@@ -8,7 +8,7 @@ Type=oneshot
 User=server
 WorkingDirectory=/home/server/software/observability-hub
 EnvironmentFile=/home/server/software/observability-hub/.env
-ExecStart=/home/server/software/observability-hub/dist/ingestion
+ExecStart=/home/server/software/observability-hub/bin/ingestion
 StandardOutput=journal
 StandardError=journal
 

systemd/proxy.service

@@ -6,12 +6,10 @@ After=network.target postgresql.service
 Type=simple
 User=server
 WorkingDirectory=/home/server/software/observability-hub
-# Pointing to the binary we will build
-ExecStart=/home/server/software/observability-hub/dist/proxy_server
+EnvironmentFile=/home/server/software/observability-hub/.env
+ExecStart=/home/server/software/observability-hub/bin/proxy_server
 Restart=always
 RestartSec=5
-# Load environment variables from the root .env
-EnvironmentFile=/home/server/software/observability-hub/.env
 StandardOutput=journal
 StandardError=journal